freifunk-franken
/
dns-scripts
6
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

sort local.conf; rename Variable for clarity 

Signed-off-by: Blackyfff <freifunk@freifunk-herpf.de>
This commit is contained in:
Blackyfff 2021-08-31 01:33:31 +02:00
parent 2a4ec02e9d
commit e60ef8c553
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/ffdns/local.conf
View File

@ -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

6
usr/lib/ffdns/update-dns.sh
View File

@ -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