forked from evolix/evobackup
Remove check_jail function
This commit is contained in:
parent
d9f8ae7036
commit
91272f49d5
|
@ -13,7 +13,7 @@ fi
|
||||||
|
|
||||||
if [ -n "${FIREWALL_RULES}" ]; then
|
if [ -n "${FIREWALL_RULES}" ]; then
|
||||||
[ -f "${FIREWALL_RULES}" ] && sed -i "/#${jail}$/d" "${FIREWALL_RULES}"
|
[ -f "${FIREWALL_RULES}" ] && sed -i "/#${jail}$/d" "${FIREWALL_RULES}"
|
||||||
if ( check_jail "${jail}" ); then
|
if [ -d "${JAILDIR}/${jail}" ]; then
|
||||||
port=$("${LIBDIR}/bkctld-port" "${jail}")
|
port=$("${LIBDIR}/bkctld-port" "${jail}")
|
||||||
for ip in $("${LIBDIR}/bkctld-ip" "${jail}"); do
|
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}"
|
echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport ${port} -s ${ip} -j ACCEPT #${jail}" >> "${FIREWALL_RULES}"
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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"
|
sshd_config="${TPLDIR}/sshd_config"
|
||||||
inctpl="${TPLDIR}/inc.tpl"
|
inctpl="${TPLDIR}/inc.tpl"
|
||||||
|
|
|
@ -11,7 +11,7 @@ ip="${2:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
fi
|
||||||
check_jail "${jail}" || error "${jail} : inexistant jail'"
|
[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'"
|
||||||
|
|
||||||
if [ -z "${ip}" ]; then
|
if [ -z "${ip}" ]; then
|
||||||
grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do
|
grep -E "^AllowUsers" "${JAILDIR}/$jail/${SSHD_CONFIG}"|grep -Eo "root@[^ ]+"| while read allow; do
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
fi
|
||||||
check_jail "${jail}" || error "${jail} : trying to check inexistant jail"
|
[ -d "${JAILDIR}/${jail}" ] || error "${jail} : trying to check inexistant jail"
|
||||||
|
|
||||||
jail="${1}"
|
jail="${1}"
|
||||||
return=1
|
return=1
|
||||||
|
|
|
@ -11,7 +11,7 @@ keyfile="${2:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
fi
|
||||||
check_jail "${jail}" || error "${jail} : inexistant jail'"
|
[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'"
|
||||||
|
|
||||||
if [ -z "${keyfile}" ]; then
|
if [ -z "${keyfile}" ]; then
|
||||||
if [ -f "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}" ]; then
|
if [ -f "${JAILDIR}/${jail}/${AUTHORIZED_KEYS}" ]; then
|
||||||
|
|
|
@ -11,7 +11,7 @@ port="${2:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
fi
|
||||||
check_jail "${jail}" || error "${jail} : inexistant jail'"
|
[ -d "${JAILDIR}/${jail}" ] || error "${jail} : inexistant jail'"
|
||||||
|
|
||||||
if [ -z "${port}" ]; then
|
if [ -z "${port}" ]; then
|
||||||
grep -E "Port [0-9]+" "${JAILDIR}/${jail}/${SSHD_CONFIG}"|grep -oE "[0-9]+"
|
grep -E "Port [0-9]+" "${JAILDIR}/${jail}/${SSHD_CONFIG}"|grep -oE "[0-9]+"
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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
|
"${LIBDIR}/bkctld-is-on" "${jail}" || exit 0
|
||||||
|
|
||||||
pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
|
pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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}"
|
"${LIBDIR}/bkctld-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}"
|
||||||
|
|
||||||
rm -f "${CONFDIR}/${jail}"
|
rm -f "${CONFDIR}/${jail}"
|
||||||
|
|
|
@ -12,6 +12,6 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}"
|
||||||
"${LIBDIR}/bkctld-start" "${jail}"
|
"${LIBDIR}/bkctld-start" "${jail}"
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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
|
"${LIBDIR}/bkctld-is-on" "${jail}" && exit 0
|
||||||
|
|
||||||
cd "${JAILDIR}/${jail}"
|
cd "${JAILDIR}/${jail}"
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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"
|
inc="0"
|
||||||
if [ -f "${CONFDIR}/${jail}" ]; then
|
if [ -f "${CONFDIR}/${jail}" ]; then
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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
|
"${LIBDIR}/bkctld-is-on" "${jail}" || exit 0
|
||||||
|
|
||||||
pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
|
pid=$(cat "${JAILDIR}/${jail}/${SSHD_PID}")
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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 !"
|
[ -n "${NODE}" ] || error "Sync need config of \$NODE in /etc/default/bkctld !"
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ jail="${1:-}"
|
||||||
if [ ! -n "${jail}" ]; then
|
if [ ! -n "${jail}" ]; then
|
||||||
"${LIBDIR}/bkctld-help" && exit 1
|
"${LIBDIR}/bkctld-help" && exit 1
|
||||||
fi
|
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}/bkctld-is-on" "${jail}" && "${LIBDIR}/bkctld-stop" "${jail}"
|
||||||
|
|
||||||
. "${LIBDIR}/mkjail"
|
. "${LIBDIR}/mkjail"
|
||||||
|
|
|
@ -20,4 +20,3 @@ WARNING="${WARNING:-24}"
|
||||||
DUC=$(command -v duc-nox||command -v duc)
|
DUC=$(command -v duc-nox||command -v duc)
|
||||||
|
|
||||||
. "${LIBDIR}/logging"
|
. "${LIBDIR}/logging"
|
||||||
. "${LIBDIR}/functions"
|
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
check_jail() {
|
|
||||||
jail="${1}"
|
|
||||||
[ -d "${JAILDIR}/${jail}" ] && return 0
|
|
||||||
return 1
|
|
||||||
}
|
|
Loading…
Reference in a new issue