diff --git a/bind_change_SOA.sh b/bind_change_SOA.sh index e5a4862..60e1bad 100755 --- a/bind_change_SOA.sh +++ b/bind_change_SOA.sh @@ -186,6 +186,7 @@ done #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" @@ -219,6 +220,9 @@ if $LOGGING ; then [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" + + [[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -227,7 +231,7 @@ if $LOGGING ; then if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi [[ -n "$ZONES_DECLARATION_FILE" ]] && DEFAULT_ZONES_DECLARATION_FILE="$ZONES_DECLARATION_FILE" diff --git a/bind_change_ip.sh b/bind_change_ip.sh index 1bd43a3..029132d 100755 --- a/bind_change_ip.sh +++ b/bind_change_ip.sh @@ -133,6 +133,7 @@ trap clean_up SIGHUP SIGINT SIGTERM #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" @@ -163,6 +164,9 @@ fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" +[[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -172,7 +176,7 @@ fi if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_BIND_CACHE_DIR}" fi if [[ -n "$ZONES_DECLARATION_FILE" ]] ; then diff --git a/bind_disable_ipv6.sh b/bind_disable_ipv6.sh index 4f2309d..4132cfb 100755 --- a/bind_disable_ipv6.sh +++ b/bind_disable_ipv6.sh @@ -99,6 +99,7 @@ trap clean_up SIGHUP SIGINT SIGTERM #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" @@ -129,6 +130,8 @@ fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" +[[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -138,7 +141,7 @@ fi if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi if [[ -n "$ZONES_DECLARATION_FILE" ]] ; then diff --git a/bind_enable_ipv6.sh b/bind_enable_ipv6.sh index 07556cc..083637c 100755 --- a/bind_enable_ipv6.sh +++ b/bind_enable_ipv6.sh @@ -99,6 +99,7 @@ trap clean_up SIGHUP SIGINT SIGTERM #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" @@ -129,6 +130,8 @@ fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" +[[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -138,7 +141,7 @@ fi if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi if [[ -n "$ZONES_DECLARATION_FILE" ]] ; then diff --git a/bind_remove_domain_on_master.sh b/bind_remove_domain_on_master.sh index c8a19a2..87ba7d8 100755 --- a/bind_remove_domain_on_master.sh +++ b/bind_remove_domain_on_master.sh @@ -213,6 +213,7 @@ fi #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" #--------------------------------------- @@ -242,6 +243,9 @@ if $LOGGING ; then fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" + + [[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -250,7 +254,7 @@ if $LOGGING ; then if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi [[ -n "$ZONES_DECLARATION_FILE" ]] && DEFAULT_ZONES_DECLARATION_FILE="$ZONES_DECLARATION_FILE" diff --git a/bind_remove_domain_on_slave.sh b/bind_remove_domain_on_slave.sh index 03852ad..846f1f0 100755 --- a/bind_remove_domain_on_slave.sh +++ b/bind_remove_domain_on_slave.sh @@ -213,6 +213,7 @@ fi #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" #--------------------------------------- @@ -242,6 +243,9 @@ if $LOGGING ; then fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" + + [[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -250,7 +254,7 @@ if $LOGGING ; then if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi [[ -n "$ZONES_DECLARATION_FILE" ]] && DEFAULT_ZONES_DECLARATION_FILE="$ZONES_DECLARATION_FILE" @@ -304,7 +308,6 @@ if $LOGGING ; then [[ -n "$DEFAULT_ZONES_DECLARATION_FILE" ]] || DEFAULT_ZONES_DECLARATION_FILE="${CONF_FILE_DIR}/named.conf.local" [[ -n "$ZONE_FILE_MASTER_DIR" ]] || ZONE_FILE_MASTER_DIR="${CONF_FILE_DIR}/master" - [[ -n "$ZONE_FILE_SLAVE_DIR" ]] || ZONE_FILE_SLAVE_DIR="${CONF_FILE_DIR}/slave" echo "" @@ -399,7 +402,7 @@ else # if $LOGGING [[ -n "$ZONES_DECLARATION_FILE" ]] || ZONES_DECLARATION_FILE="${CONF_FILE_DIR}/named.conf.local" [[ -n "$ZONE_FILE_MASTER_DIR" ]] || ZONE_FILE_MASTER_DIR="${CONF_FILE_DIR}/master" - [[ -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" fi diff --git a/bind_set_ttl_to_default.sh b/bind_set_ttl_to_default.sh index 6e2eb56..a982a95 100755 --- a/bind_set_ttl_to_default.sh +++ b/bind_set_ttl_to_default.sh @@ -133,6 +133,7 @@ trap clean_up SIGHUP SIGINT SIGTERM #--------------------------------------- DEFAULT_CONF_FILE_DIR="/etc/bind" +DEFAULT_BIND_CACHE_DIR="/var/cache/bind" @@ -163,6 +164,8 @@ fi [[ -n "$CONF_FILE_DIR" ]] && DEFAULT_CONF_FILE_DIR="$CONF_FILE_DIR" +[[ -n "$BIND_CACHE_DIR" ]] && DEFAULT_BIND_CACHE_DIR="$BIND_CACHE_DIR" + if [[ -n "$ZONE_FILE_MASTER_DIR" ]] ; then DEFAULT_ZONE_FILE_MASTER_DIR="$ZONE_FILE_MASTER_DIR" else @@ -172,7 +175,7 @@ fi if [[ -n "$ZONE_FILE_SLAVE_DIR" ]] ; then DEFAULT_ZONE_FILE_SLAVE_DIR="$ZONE_FILE_SLAVE_DIR" else - DEFAULT_ZONE_FILE_SLAVE_DIR="${DEFAULT_CONF_FILE_DIR}/slave" + DEFAULT_ZONE_FILE_SLAVE_DIR="$DEFAULT_BIND_CACHE_DIR" fi if [[ -n "$ZONE_FILE_SUFFIX" ]] ; then