diff --git a/bind_add_dkim_zone_master.sh b/bind_add_dkim_zone_master.sh index 53e83af..c761eab 100755 --- a/bind_add_dkim_zone_master.sh +++ b/bind_add_dkim_zone_master.sh @@ -39,6 +39,8 @@ DEFAULT_CONF_FILE_DIR="/etc/bind" DEFAULT_BIND_USER="bind" DEFAULT_BIND_GROUP="bind" +DEFAULT_ZONE_FILE_DYNAMIC_UPDATE_DIR="/var/lib/bind" + DEFAULT_ZONE_FILE_SUFFIX="zone" DEFAULT_SOA_ADMIN_EMAIL="domreg@oopen.de" DEFAULT_TSIG_KEY_NAME="update-dkim" @@ -343,7 +345,7 @@ fi [[ -n "$BIND_USER" ]] || BIND_USER="$DEFAULT_BIND_USER" [[ -n "$BIND_GROUP" ]] || BIND_GROUP="$DEFAULT_BIND_GROUP" -[[ -n "$ZONE_FILE_MASTER_DIR" ]] || ZONE_FILE_MASTER_DIR="${CONF_FILE_DIR}/master" +[[ -n "$ZONE_FILE_DYNAMIC_UPDATE_DIR" ]] || ZONE_FILE_DYNAMIC_UPDATE_DIR="$DEFAULT_ZONE_FILE_DYNAMIC_UPDATE_DIR" [[ -n "$ZONE_FILE_SUFFIX" ]] || ZONE_FILE_SUFFIX="$DEFAULT_ZONE_FILE_SUFFIX" [[ -n "$SOA_ADMIN_EMAIL" ]] || SOA_ADMIN_EMAIL="$DEFAULT_SOA_ADMIN_EMAIL" @@ -370,7 +372,7 @@ SOA_ADMIN_EMAIL="${SOA_ADMIN_EMAIL/@/.}" new_dkim_zone="_domainkey.$dkim_domain" -new_zone_file="${ZONE_FILE_MASTER_DIR}/${new_dkim_zone}.${ZONE_FILE_SUFFIX}" +new_zone_file="${ZONE_FILE_DYNAMIC_UPDATE_DIR}/${new_dkim_zone}.${ZONE_FILE_SUFFIX}" _zone_configuration_exists=false diff --git a/bind_add_dkim_zone_slave.sh b/bind_add_dkim_zone_slave.sh index f537a71..8dde4d2 100755 --- a/bind_add_dkim_zone_slave.sh +++ b/bind_add_dkim_zone_slave.sh @@ -33,6 +33,8 @@ DEFAULT_CONF_FILE_DIR="/etc/bind" DEFAULT_BIND_USER="bind" DEFAULT_BIND_GROUP="bind" +DEFAULT_ZONE_FILE_SLAVE_DIR="/var/cache/bind" + DEFAULT_ZONE_FILE_SUFFIX="zone" @@ -324,7 +326,7 @@ fi [[ -n "$BIND_USER" ]] || BIND_USER="$DEFAULT_BIND_USER" [[ -n "$BIND_GROUP" ]] || BIND_GROUP="$DEFAULT_BIND_GROUP" -[[ -n "$ZONE_FILE_SLAVE_DIR" ]] || ZONE_FILE_SLAVE_DIR="${CONF_FILE_DIR}/slave" +[[ -n "$ZONE_FILE_SLAVE_DIR" ]] || ZONE_FILE_SLAVE_DIR="$DEFAULT_ZONE_FILE_SLAVE_DIR" [[ -n "$ZONE_FILE_SUFFIX" ]] || ZONE_FILE_SUFFIX="$DEFAULT_ZONE_FILE_SUFFIX" if [[ -z "$DKIM_DNS_MASTER" ]] ; then diff --git a/conf/bind_add_dkim_zone_master.conf.sample b/conf/bind_add_dkim_zone_master.conf.sample index 8907d38..5a29b49 100644 --- a/conf/bind_add_dkim_zone_master.conf.sample +++ b/conf/bind_add_dkim_zone_master.conf.sample @@ -37,3 +37,12 @@ # - ALLOW_TRANSFER_OPTION="83.223.90.93;" # - #ALLOW_TRANSFER_OPTION="" + +# - ZONE_FILE_DYNAMIC_UPDATE_DIR +# - +# - The directory where dynamically updated zone (and journal) files life +# - +# - Defaults to: +# - ZONE_FILE_DYNAMIC_UPDATE_DIR=/var/lib/bind +# - +#ZONE_FILE_DYNAMIC_UPDATE_DIR=/var/lib/bind diff --git a/conf/bind_add_dkim_zone_slave.conf.sample b/conf/bind_add_dkim_zone_slave.conf.sample index 05e6586..77db560 100644 --- a/conf/bind_add_dkim_zone_slave.conf.sample +++ b/conf/bind_add_dkim_zone_slave.conf.sample @@ -22,3 +22,12 @@ # - Defaults to DKIM_DNS_MASTER IPv4 Address # - #ALLOW_TRANSFER_OPTION="" + +# - ZONE_FILE_SLAVE_DIR +# - +# - The directory where slave/stub data located +# - +# - Defaults to: +# - ZONE_FILE_SLAVE_DIR="/var/cache/bind" +# - +#ZONE_FILE_SLAVE_DIR="/var/cache/bind"