sort local.conf; rename Variable for clarity

Signed-off-by: Blackyfff <freifunk@freifunk-herpf.de>

README.md

@@ -35,10 +35,10 @@ Die Datei /etc/ffdns/community.conf wird für eine Community konfiguriert(vorzug
 
 Die Datei /etc/ffdns/local.conf muss serverspezifisch konfiguriert werden.
 
-Für die Konfiguration der Zonendatei siehe https://git.freifunk-franken/freifunk-franken/dns
+Für die Konfiguration der Zonendatei siehe https://git.freifunk-franken.de/freifunk-franken/dns
 
 #### Cron anlegen
-Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft:
+Das Script muss regelmäßig aufgerufen werden, z.B. via Cron:
 ```
 1-59/5 *   * * *   /usr/lib/ffdns/update-dns.sh
 ```

etc/ffdns/local.conf

@@ -7,16 +7,9 @@ DNSSCRIPT_CONTACT_EMAIL=""
 #DNSSCRIPT_SERVER_NAME="dns.herpf.fff.community"
 DNSSCRIPT_SERVER_NAME=""
 
-### If you are a root for $CommunityDomain or a first level Hood: do not specify
-### If serving a subsequent subdomain, specify Remote and all Subdomains excluding the own
-### For example if you are serving <own sub>.<sub2>.<sub1>.<community dom> then specify <sub2>.<sub1>
-### master file in remote needs to be named: db.<sub2>.<sub1>.<community dom>
-#RemoteLocation="https://gw01.herpf.fff.community/ffdns/"
-#SubCommunityDomain="herpf"
-
 ZoneFilesFolder="/etc/bind/fff/"
-BindIncludeFileFolder="/etc/bind/"
 TempFolder="/tmp/ffdns/"
+GeneratedIncludeFileFolder="/etc/bind/"
 
 ### specify the bird/babel or other routing table[s]
 ### if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateway)
@@ -36,6 +29,13 @@ InternalViews="icvpn-internal-view icvpn-internal-dns64-view"
 ### can be empty
 ExternalView="external-view"
 
+### If you are a root for $CommunityDomain or a first level Hood: do not specify
+### If serving a subsequent subdomain, specify Remote and all Subdomains excluding the own
+### For example if you are serving <own sub>.<sub2>.<sub1>.<community dom> then specify <sub2>.<sub1>
+### master file in remote needs to be named: db.<sub2>.<sub1>.<community dom>
+#RemoteLocation="https://gw01.herpf.fff.community/ffdns/"
+#SubCommunityDomain="herpf"
+
 #DNSSEC
 
 ### DNSSECPolicy and Folder specified in named.conf; if no DNSSEC is used leave empty

usr/lib/ffdns/update-dns.sh

@@ -32,7 +32,7 @@ FirstInternalView="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')"
 # ForwardZones: "<Zone>/<Zonendatei>" ; optionaly multiple " ""<ZoneX>/<ZonendateiX>" no spaces in full filename
 ForwardZones="$MasterDomain""/""$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
 BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf"
-BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf"
+BindIcvpnAcl="$GeneratedIncludeFileFolder""icvpn-acl.conf"
 [ -n "$DNSSECPolicy" ] || DNSSECKeyFolder=""
 
 SetupCache
@@ -149,10 +149,10 @@ UpdateBindConfig() {
 
 UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl"
 for IView in $InternalViews; do
-	UpdateBindConfig "$TempFolder""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf"
+	UpdateBindConfig "$TempFolder""$IView"".conf" "$GeneratedIncludeFileFolder""$IView"".conf"
 done
 if [ -n "$ExternalView" ]; then
-	UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf"
+	UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$GeneratedIncludeFileFolder""$ExternalView"".conf"
 fi
 
 if [ $ReConfigBind -ne 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then