From 9faa3b3c34a7c3dcba5ebfb3a58e30a7378f94be Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 12 Jan 2017 11:14:15 +0100 Subject: [PATCH] Fix default constants --- bkctld | 4 ++-- bkctld.conf | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bkctld b/bkctld index b2c3bd7..cafa72a 100755 --- a/bkctld +++ b/bkctld @@ -507,8 +507,8 @@ main() { [ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup' [ -z "${JAILDIR}" ] && JAILDIR='/backup/jails' [ -z "${INCDIR}" ] && INCDIR='/backup/incs' - [ -z "${TPLDIR}" ] && TPLDIR='/usr/local/share/evobackup' - [ -z "${LOG_DIR}" ] && LOG_DIR='/var/log/bkctld' + [ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld' + [ -z "${LOG_DIR}" ] && LOG_DIR='/var/log' [ -z "${SSHD_PID}" ] && SSHD_PID='/var/run/sshd.pid' [ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config' [ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys' diff --git a/bkctld.conf b/bkctld.conf index f0f8f3c..50b6d7a 100644 --- a/bkctld.conf +++ b/bkctld.conf @@ -1,9 +1,4 @@ # Defaults for bkctld command (evobackup) # sourced by /usr/sbin/bkctld and /etc/init.d/bkctld -CONFDIR='/etc/evobackup' -JAILDIR='/backup/jails' -INCDIR='/backup/incs' -TPLDIR='/usr/share/evobackup' -LOG_DIR='/var/log/bkctld' FIREWALL_RULES='/etc/firewall.rc.jails'