SVN: admin/dns: acl_tpnet.conf acl_vnet.conf check.sh named.conf named.conf.rest named.conf.tpnet na...

[arekm]

Author: arekm
Date: Wed Apr  9 22:32:45 2025
New Revision: 12797

Removed:
   admin/dns/acl_tpnet.conf
   admin/dns/acl_vnet.conf
   admin/dns/named.conf.rest
   admin/dns/named.conf.tpnet
   admin/dns/named.conf.vnet
   admin/dns/pld-linux.org.mirrors
   admin/dns/pld-linux.org.rsync
   admin/dns/pld-linux.org.template
Modified:
   admin/dns/check.sh
   admin/dns/named.conf
Log:
Simplify dns config. No need for tpnet view hacks.

Modified: admin/dns/check.sh
==============================================================================
--- admin/dns/check.sh	(original)
+++ admin/dns/check.sh	Wed Apr  9 22:32:45 2025
@@ -20,51 +20,25 @@
 /usr/bin/svn up --quiet || exit 1
 
 #
-# preare zone files for separate views
-#
-
-# ftp mirrors
-. ./pld-linux.org.mirrors
-/bin/sed -e "s/%FTPMIRROR%/${FTP}/g" pld-linux.org.template > pld-linux.org.zone
-/bin/sed -e "s/%FTPMIRROR%/${FTP_TPNET}/g" pld-linux.org.template >pld-linux.org.zone-tpnet
-/bin/sed -e "s/%FTPMIRROR%/${FTP_VNET}/g" pld-linux.org.template >pld-linux.org.zone-vnet
-
-# rsync 
-. ./pld-linux.org.rsync
-/bin/sed -i -e "s/%RSYNC%/${RSYNC}/g" pld-linux.org.zone
-/bin/sed -i -e "s/%RSYNC%/${RSYNC}/g" pld-linux.org.zone-tpnet
-/bin/sed -i -e "s/%RSYNC%/${RSYNC_VNET}/g" pld-linux.org.zone-vnet
-
-#
 # fix perms
 #
 chmod 754 check.sh
-chmod 640 named.conf{,.{rest,tpnet,vnet}} acl_{tpnet,vnet}.conf
-chown root:named named.conf{,.{rest,tpnet,vnet}} acl_{tpnet,vnet}.conf
-chmod 644 pld-linux.org.zone{,-{tpnet,vnet}} 
+chmod 640 named.conf
+chown root:named named.conf
+chmod 644 pld-linux.org.zone
 
 #
 # check that we are safe to reload nameserver
 # 
 # check that we are safe to reload nameserver
-valid_ok=1
-for zonef in pld-linux.org.zone pld-linux.org.zone-tpnet pld-linux.org.zone-vnet; do
-        if ! /usr/bin/named-checkzone -q pld-linux.org $zonef; then
-                echo "Zone file $zonef validation failed:"
-                /usr/bin/named-checkzone pld-linux.org $zonef
-                valid_ok=0
-        fi
-done
 
-if [ $valid_ok -ne 1 ]; then
-        exit 1
-fi
+/usr/bin/named-checkzone -q pld-linux.org pld-linux.org.zone || /usr/bin/named-checkzone pld-linux.org pld-linux.org.zone
 
 #
 # move zone and config files to proper dir
 #
-mv named.conf{,.{rest,tpnet,vnet}} acl_{tpnet,vnet}.conf ../etc
-mv pld-linux.org.zone{,-{tpnet,vnet}} ../M
+cp -f named.conf ../etc
+cp -f pld-linux.org.zone ../M
 cp -f pld.org.pl.zone ../M
 
 # 

Modified: admin/dns/named.conf
==============================================================================
--- admin/dns/named.conf	(original)
+++ admin/dns/named.conf	Wed Apr  9 22:32:45 2025
@@ -1,5 +1,5 @@
 // This is an exaple configuration file for named ( /etc/named.conf ) 
-// Przyk³adowy plik konfiguracyjny /etc/named.conf dla serwera nazw `named'
+// Przyk?adowy plik konfiguracyjny /etc/named.conf dla serwera nazw `named'
 
 
 options {
@@ -29,8 +29,13 @@
         category notify { xfer-log; };
 };
 
-include "/etc/acl_tpnet.conf";
-include "/etc/acl_vnet.conf";
-include "/etc/named.conf.tpnet";
-include "/etc/named.conf.vnet";
-include "/etc/named.conf.rest";
+
+zone "pld-linux.org" {
+        type master;
+        file "M/pld-linux.org.zone";
+};
+
+zone "pld.org.pl" {
+        type master;
+        file "M/pld.org.pl.zone";
+};