diff --git a/lib/bkctld-firewall b/lib/bkctld-firewall index d063fb4..eacb752 100755 --- a/lib/bkctld-firewall +++ b/lib/bkctld-firewall @@ -13,7 +13,7 @@ fi if [ -n "${FIREWALL_RULES}" ]; then [ -f "${FIREWALL_RULES}" ] && sed -i "/#${jail}$/d" "${FIREWALL_RULES}" - if ( check_jail "${jail}" ); then + if [ -d "${JAILDIR}/${jail}" ]; then port=$("${LIBDIR}/bkctld-port" "${jail}") for ip in $("${LIBDIR}/bkctld-ip" "${jail}"); do echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport ${port} -s ${ip} -j ACCEPT #${jail}" >> "${FIREWALL_RULES}" diff --git a/lib/bkctld-init b/lib/bkctld-init index 8010c6c..29fe670 100755 --- a/lib/bkctld-init +++ b/lib/bkctld-init @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" && error "${jail} : trying to create existant jail" +[ -d "${JAILDIR}/${jail}" ] && error "${jail} : trying to create existant jail" sshd_config="${TPLDIR}/sshd_config" inctpl="${TPLDIR}/inc.tpl" diff --git a/lib/bkctld-ip b/lib/bkctld-ip index 49cb1b8..5512b12 100755 --- a/lib/bkctld-ip +++ b/lib/bkctld-ip @@ -11,7 +11,7 @@ ip="${2:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : inexistant jail'" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'" if [ -z "${ip}" ]; then grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do diff --git a/lib/bkctld-is-on b/lib/bkctld-is-on index 41f548a..ac19ce0 100755 --- a/lib/bkctld-is-on +++ b/lib/bkctld-is-on @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to check inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to check inexistant jail" jail="${1}" return=1 diff --git a/lib/bkctld-key b/lib/bkctld-key index bf75f8d..5fb8c53 100755 --- a/lib/bkctld-key +++ b/lib/bkctld-key @@ -11,7 +11,7 @@ keyfile="${2:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : inexistant jail'" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'" if [ -z "${keyfile}" ]; then if [ -f "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}" ]; then diff --git a/lib/bkctld-port b/lib/bkctld-port index 86f05fc..6f86092 100755 --- a/lib/bkctld-port +++ b/lib/bkctld-port @@ -11,7 +11,7 @@ port="${2:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : inexistant jail'" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'" if [ -z "${port}" ]; then grep -E "Port [0-9]+" "${JAILDIR}/${jail}/${SSHD_CONFIG}"|grep -oE "[0-9]+" diff --git a/lib/bkctld-reload b/lib/bkctld-reload index 1b8701f..3f2fb56 100755 --- a/lib/bkctld-reload +++ b/lib/bkctld-reload @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to reload inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to reload inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" || exit 0 pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}") diff --git a/lib/bkctld-remove b/lib/bkctld-remove index bbd4884..a8d6df7 100755 --- a/lib/bkctld-remove +++ b/lib/bkctld-remove @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to remove inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to remove inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}" rm -f "${CONFDIR}/${jail}" diff --git a/lib/bkctld-restart b/lib/bkctld-restart index 40701bc..22d778e 100755 --- a/lib/bkctld-restart +++ b/lib/bkctld-restart @@ -12,6 +12,6 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to restart inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to restart inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}" "${LIBDIR}/bkctld-start" "${jail}" diff --git a/lib/bkctld-start b/lib/bkctld-start index 9749633..810c5ce 100755 --- a/lib/bkctld-start +++ b/lib/bkctld-start @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to start inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to start inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" && exit 0 cd "${JAILDIR}/${jail}" diff --git a/lib/bkctld-status b/lib/bkctld-status index d2e3dfa..b873ced 100755 --- a/lib/bkctld-status +++ b/lib/bkctld-status @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : inexistant jail ! Use '$0 status' for list all" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail ! Use '$0 status' for list all" inc="0" if [ -f "${CONFDIR}/${jail}" ]; then diff --git a/lib/bkctld-stop b/lib/bkctld-stop index 8f76cd7..cdb2b25 100755 --- a/lib/bkctld-stop +++ b/lib/bkctld-stop @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to stop inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to stop inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" || exit 0 pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}") diff --git a/lib/bkctld-sync b/lib/bkctld-sync index b484bac..65eb58b 100755 --- a/lib/bkctld-sync +++ b/lib/bkctld-sync @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to sync inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to sync inexistant jail" [ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !" diff --git a/lib/bkctld-update b/lib/bkctld-update index 1998fea..4e8f141 100755 --- a/lib/bkctld-update +++ b/lib/bkctld-update @@ -10,7 +10,7 @@ jail="${1:-}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi -check_jail "${jail}" || error "${jail} : trying to update inexistant jail" +[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to update inexistant jail" "${LIBDIR}/bkctld-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}" . "${LIBDIR}/mkjail" diff --git a/lib/config b/lib/config index 0c14959..d71ad55 100755 --- a/lib/config +++ b/lib/config @@ -20,4 +20,3 @@ WARNING="${WARNING:-24}" DUC=$(command -v duc-nox||command -v duc) . "${LIBDIR}/logging" -. "${LIBDIR}/functions" diff --git a/lib/functions b/lib/functions deleted file mode 100755 index c21fc2c..0000000 --- a/lib/functions +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -check_jail() { - jail="${1}" - [ -d "${JAILDIR}/${jail}" ] && return 0 - return 1 -}