extract functions for config files
This commit is contained in:
parent
4ef7ab2dde
commit
c58878b065
|
@ -52,7 +52,7 @@ check_jail() {
|
||||||
last_conn=$(stat --format=%Y "${jail_path}/var/log/lastlog")
|
last_conn=$(stat --format=%Y "${jail_path}/var/log/lastlog")
|
||||||
date_diff=$(( (cur_time - last_conn) / (60*60) ))
|
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
|
if [ -f "${check_policy_file}" ]; then
|
||||||
local_critical=$(read_variable "CRITICAL" "${check_policy_file}")
|
local_critical=$(read_variable "CRITICAL" "${check_policy_file}")
|
||||||
|
|
|
@ -63,7 +63,7 @@ inc_name=$(date +"%Y-%m-%d-%H")
|
||||||
for jail_name in $(jails_list); do
|
for jail_name in $(jails_list); do
|
||||||
jail_path=$(jail_path "${jail_name}")
|
jail_path=$(jail_path "${jail_name}")
|
||||||
inc_path=$(inc_path "${jail_name}" "${inc_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 not incs policy is found, we don't create incs
|
||||||
if [ -n "${incs_policy_file}" ]; then
|
if [ -n "${incs_policy_file}" ]; then
|
||||||
|
|
|
@ -64,7 +64,7 @@ delete_inc_ext() {
|
||||||
}
|
}
|
||||||
|
|
||||||
for jail_name in $(jails_list); do
|
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 not incs policy if found, we don't remove incs
|
||||||
if [ -n "${incs_policy_file}" ]; then
|
if [ -n "${incs_policy_file}" ]; then
|
||||||
|
|
12
lib/includes
12
lib/includes
|
@ -114,7 +114,12 @@ inc_path() {
|
||||||
jail_incs_policy_file() {
|
jail_incs_policy_file() {
|
||||||
jail_name=$1
|
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}"
|
old_file="${CONFDIR}/${jail_name}"
|
||||||
|
|
||||||
if [ -f "${new_file}" ]; then
|
if [ -f "${new_file}" ]; then
|
||||||
|
@ -128,6 +133,11 @@ 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"
|
||||||
|
}
|
||||||
|
current_jail_check_policy_file() {
|
||||||
|
jail_name=${1:?}
|
||||||
|
|
||||||
new_file="${CONFDIR}/${jail_name}.d/check_policy"
|
new_file="${CONFDIR}/${jail_name}.d/check_policy"
|
||||||
# old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"
|
# old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue