evolix/evobackup
22
0
Fork 1
Code Issues 28 Pull requests 5 Releases 21 Activity

Code cleanup #33

Manually merged
jlecour merged 71 commits from jlecour-refactoring into master 2020-04-17 15:32:41 +02:00
Conversation 1 Commits 71 Files changed 36 +12 -3
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1da1c8a7fe - Show all commits

15
lib/includes
View file

@ -111,10 +111,17 @@ inc_path() {
echo "${INCDIR}/${jail_name}/${inc_name}"
}
jail_config_dir() {
jail_name=${1:?}
echo "${CONFDIR}/${jail_name}.d"
}
jail_incs_policy_file() {
jail_name=${1:?}
echo "${CONFDIR}/${jail_name}.d/incs_policy"
jail_config_dir=$(jail_config_dir "${jail_name}")
echo "${jail_config_dir}/incs_policy"
}
current_jail_incs_policy_file() {
jail_name=${1:?}
@ -133,12 +140,14 @@ current_jail_incs_policy_file() {
jail_check_policy_file() {
jail_name=${1:?}
echo "${CONFDIR}/${jail_name}.d/check_policy"
jail_config_dir=$(jail_config_dir "${jail_name}")
echo "${jail_config_dir}/check_policy"
}
current_jail_check_policy_file() {
jail_name=${1:?}
new_file="${CONFDIR}/${jail_name}.d/check_policy"
new_file="$(jail_check_policy_file "${jail_name}")"
# old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"
if [ -f "${new_file}" ]; then