extract function for jail config directory
This commit is contained in:
parent
f36771d1f0
commit
1da1c8a7fe
15
lib/includes
15
lib/includes
|
@ -111,10 +111,17 @@ inc_path() {
|
||||||
|
|
||||||
echo "${INCDIR}/${jail_name}/${inc_name}"
|
echo "${INCDIR}/${jail_name}/${inc_name}"
|
||||||
}
|
}
|
||||||
|
jail_config_dir() {
|
||||||
|
jail_name=${1:?}
|
||||||
|
|
||||||
|
echo "${CONFDIR}/${jail_name}.d"
|
||||||
|
}
|
||||||
jail_incs_policy_file() {
|
jail_incs_policy_file() {
|
||||||
jail_name=${1:?}
|
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() {
|
current_jail_incs_policy_file() {
|
||||||
jail_name=${1:?}
|
jail_name=${1:?}
|
||||||
|
@ -133,12 +140,14 @@ current_jail_incs_policy_file() {
|
||||||
jail_check_policy_file() {
|
jail_check_policy_file() {
|
||||||
jail_name=${1:?}
|
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() {
|
current_jail_check_policy_file() {
|
||||||
jail_name=${1:?}
|
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"
|
# old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"
|
||||||
|
|
||||||
if [ -f "${new_file}" ]; then
|
if [ -f "${new_file}" ]; then
|
||||||
|
|
Loading…
Reference in a new issue