forked from evolix/evobackup
extract variable "jail_sshd_config"
This commit is contained in:
parent
5a90ae8a16
commit
53b8fe8376
|
@ -17,15 +17,17 @@ jail_path=$(jail_path "${jail_name}")
|
||||||
|
|
||||||
test -d "${jail_path}" || error "${jail_name}: jail is missing."
|
test -d "${jail_path}" || error "${jail_name}: jail is missing."
|
||||||
|
|
||||||
|
jail_sshd_config="${jail_path}/${SSHD_CONFIG}"
|
||||||
|
|
||||||
if [ -z "${port}" ]; then
|
if [ -z "${port}" ]; then
|
||||||
grep -E "Port [0-9]+" "${jail_path}/${SSHD_CONFIG}"|grep -oE "[0-9]+"
|
grep -E "Port [0-9]+" "${jail_sshd_config}"|grep -oE "[0-9]+"
|
||||||
else
|
else
|
||||||
if [ "${port}" = "auto" ]; then
|
if [ "${port}" = "auto" ]; then
|
||||||
port=$(grep -h Port "${JAILDIR}"/*/"${SSHD_CONFIG}" 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
|
port=$(grep -h Port "${JAILDIR}"/*/"${SSHD_CONFIG}" 2>/dev/null | grep -Eo "[0-9]+" | sort -n | tail -1)
|
||||||
port=$((port+1))
|
port=$((port+1))
|
||||||
[ "${port}" -le 1 ] && port=2222
|
[ "${port}" -le 1 ] && port=2222
|
||||||
fi
|
fi
|
||||||
sed -i "s/^Port .*/Port ${port}/" "${jail_path}/${SSHD_CONFIG}"
|
sed -i "s/^Port .*/Port ${port}/" "${jail_sshd_config}"
|
||||||
|
|
||||||
notice "${jail_name}: port has been updated to ${port}"
|
notice "${jail_name}: port has been updated to ${port}"
|
||||||
|
|
||||||
|
|
|
@ -226,12 +226,13 @@ setup_jail_config() {
|
||||||
jail_name=${1:?}
|
jail_name=${1:?}
|
||||||
|
|
||||||
jail_path=$(jail_path "${jail_name}")
|
jail_path=$(jail_path "${jail_name}")
|
||||||
|
jail_sshd_config="${jail_path}/${SSHD_CONFIG}"
|
||||||
|
|
||||||
sshd_config="${TPLDIR}/sshd_config"
|
sshd_config_tpl="${TPLDIR}/sshd_config"
|
||||||
test -f "${LOCALTPLDIR}/sshd_config" && sshd_config="${LOCALTPLDIR}/sshd_config"
|
test -f "${LOCALTPLDIR}/sshd_config" && sshd_config_tpl="${LOCALTPLDIR}/sshd_config"
|
||||||
|
|
||||||
info "4 - Copie default sshd_config"
|
info "4 - Copie default sshd_config"
|
||||||
install -m 0640 "${sshd_config}" "${jail_path}/${SSHD_CONFIG}"
|
install -m 0640 "${sshd_config_tpl}" "${jail_sshd_config}"
|
||||||
|
|
||||||
inctpl="${TPLDIR}/inc.tpl"
|
inctpl="${TPLDIR}/inc.tpl"
|
||||||
test -f "${LOCALTPLDIR}/inc.tpl" && inctpl="${LOCALTPLDIR}/inc.tpl"
|
test -f "${LOCALTPLDIR}/inc.tpl" && inctpl="${LOCALTPLDIR}/inc.tpl"
|
||||||
|
|
Loading…
Reference in a new issue