Improve handling of dns records without explicit TTL values

Fix usage of missing 'rtype' var in v-change-dns-record

Update changelog

Author: Lupul

CHANGELOG.md

@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## [CURRENT] - Development
 ### Features
+- Added support for configuring individual TTL per DNS record. Thanks to @jaapmarcus
 
 ### Bugfixes
 - Disable Apache2 Server Status Module by default.

bin/v-add-dns-record

@@ -101,15 +101,10 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
 
 # Adding record
 zone="$USER_DATA/dns/$domain.conf"
-if [ "$ttl" == '' ]; then
-    dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
-    dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
-    echo "$dns_rec" >> $zone;
-    else
-    dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
-    dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date' TTL='$ttl'"
-    echo "$dns_rec" >> $zone
-fi 
+dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
+dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
+[ ! -z "$ttl" ] && dns_rec="$dns_rec TTL='$ttl'"
+echo "$dns_rec" >> $zone;
 chmod 660 $zone
 
 # Sorting records

bin/v-change-dns-record

@@ -84,16 +84,10 @@ time=$(echo "$time_n_date" |cut -f 1 -d \ )
 date=$(echo "$time_n_date" |cut -f 2 -d \ )
 
 # Adding record
-zone="$USER_DATA/dns/$domain.conf"
-if [ "$ttl" == '' ]; then
-    dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
-    dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
-    echo "$dns_rec" >> $zone;
-    else
-    dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
-    dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date' TTL='$ttl'"
-    echo "$dns_rec" >> $zone
-fi 
+dns_rec="ID='$id' RECORD='$record' TYPE='$type' PRIORITY='$priority'"
+dns_rec="$dns_rec VALUE='$dvalue' SUSPENDED='no' TIME='$time' DATE='$date'"
+[ ! -z "$ttl" ] && dns_rec="$dns_rec TTL='$ttl'"
+echo "$dns_rec" >> $USER_DATA/dns/$domain.conf
 
 # Sorting records
 sort_dns_records

bin/v-list-dns-records

@@ -24,7 +24,9 @@ json_list() {
     objects=$(grep ID $USER_DATA/dns/$domain.conf |wc -l)
     echo "{"
     while read str; do
+        unset TTL
         parse_object_kv_list "$str"
+        [ -z "$TTL" ] && TTL="$zone_ttl"
         VALUE=$(echo "$VALUE" |sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
         echo -n '    "'$ID'": {
         "RECORD": "'$RECORD'",
@@ -53,7 +55,9 @@ shell_list() {
     echo "ID^RECORD^TYPE^VALUE^DATE^TTL"
     echo "--^------^----^-----^----^----"
     while read str; do
+        unset TTL
         parse_object_kv_list "$str"
+        [ -z "$TTL" ] && TTL="$zone_ttl"
         echo "$ID^$RECORD^$TYPE^${VALUE:0:30}^$DATE^$TTL"
     done < <(cat $USER_DATA/dns/$domain.conf)
 }
@@ -62,7 +66,9 @@ shell_list() {
 plain_list() {
     IFS=$'\n'
     while read str; do
+        unset TTL
         parse_object_kv_list "$str"
+        [ -z "$TTL" ] && TTL="$zone_ttl"
         VALUE=$(echo "$VALUE" |sed -e "s/%quote%/\\'/g")
         echo -ne "$ID\t$RECORD\t$TYPE\t$PRIORITY\t$VALUE\t"
         echo -e "$SUSPENDED\t$TIME\t$DATE\t$TTL"
@@ -74,7 +80,9 @@ csv_list() {
     IFS=$'\n'
     echo "ID,RECORD,TYPE,PRIORITY,VALUE,SUSPENDED,TIME,DATE,TTL"
     while read str; do
+        unset TTL
         parse_object_kv_list "$str"
+        [ -z "$TTL" ] && TTL="$zone_ttl"
         VALUE=$(echo "$VALUE" |sed -e "s/%quote%/\\'/g")
         echo -n "$ID,$RECORD,$TYPE,$PRIORITY,\"$VALUE\","
         echo "$SUSPENDED,$TIME,$DATE,$TTL"
@@ -96,6 +104,8 @@ is_object_valid 'dns' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#
 
+zone_ttl="$(get_object_value 'dns' 'DOMAIN' "$domain" '$TTL')"
+
 # Listing data
 case $format in
     json)   json_list ;;

func/domain.sh

@@ -436,6 +436,7 @@ is_dns_domain_new() {
 update_domain_zone() {
     domain_param=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
     parse_object_kv_list "$domain_param"
+    local zone_ttl="$TTL"
     SOA=$(idn --quiet -a -t "$SOA")
     if [ -z "$SERIAL" ]; then
         SERIAL=$(date +'%Y%m%d01')
@@ -456,11 +457,15 @@ update_domain_zone() {
 " > $zn_conf
     fields='$RECORD\t$TTL\tIN\t$TYPE\t$PRIORITY\t$VALUE'
     while read line ; do
+        unset TTL
         IFS=$'\n'
         for key in $(echo $line|sed "s/' /'\n/g"); do
             eval ${key%%=*}="${key#*=}"
         done
 
+        # inherit zone TTL if record lacks explicit TTL value
+        [ -z "$TTL" ] && TTL="$zone_ttl"
+
         RECORD=$(idn --quiet -a -t "$RECORD")
         if [ "$TYPE" = 'CNAME' ] || [ "$TYPE" = 'MX' ]; then
             VALUE=$(idn --quiet -a -t "$VALUE")