extract functions for config files

lib/bkctld-check

@@ -52,7 +52,7 @@ check_jail() {
     last_conn=$(stat --format=%Y "${jail_path}/var/log/lastlog")
     date_diff=$(( (cur_time - last_conn) / (60*60) ))
 
-    check_policy_file=$(jail_check_policy_file "${jail_name}")
+    check_policy_file=$(current_jail_check_policy_file "${jail_name}")
 
     if [ -f "${check_policy_file}" ]; then
         local_critical=$(read_variable "CRITICAL" "${check_policy_file}")

lib/bkctld-inc

@@ -63,7 +63,7 @@ inc_name=$(date +"%Y-%m-%d-%H")
 for jail_name in $(jails_list); do
     jail_path=$(jail_path "${jail_name}")
     inc_path=$(inc_path "${jail_name}" "${inc_name}")
-    incs_policy_file=$(jail_incs_policy_file ${jail_name})
+    incs_policy_file=$(current_jail_incs_policy_file ${jail_name})
 
     # If not incs policy is found, we don't create incs
     if [ -n "${incs_policy_file}" ]; then

lib/bkctld-rm

@@ -64,7 +64,7 @@ delete_inc_ext() {
 }
 
 for jail_name in $(jails_list); do
-    incs_policy_file=$(jail_incs_policy_file ${jail_name})
+    incs_policy_file=$(current_jail_incs_policy_file ${jail_name})
 
     # If not incs policy if found, we don't remove incs
     if [ -n "${incs_policy_file}" ]; then

lib/includes

@@ -114,7 +114,12 @@ inc_path() {
 jail_incs_policy_file() {
     jail_name=$1
 
-    new_file="${CONFDIR}/${jail_name}.d/incs_policy"
+    echo "${CONFDIR}/${jail_name}.d/incs_policy"
+}
+current_jail_incs_policy_file() {
+    jail_name=${1:?}
+
+    new_file="$(jail_incs_policy_file "${jail_name}")"
     old_file="${CONFDIR}/${jail_name}"
 
     if [ -f "${new_file}" ]; then
@@ -128,6 +133,11 @@ jail_incs_policy_file() {
 jail_check_policy_file() {
     jail_name=$1
 
+    echo "${CONFDIR}/${jail_name}.d/check_policy"
+}
+current_jail_check_policy_file() {
+    jail_name=${1:?}
+
     new_file="${CONFDIR}/${jail_name}.d/check_policy"
     # old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"