Updated ns{1,2}.in (added linuxone zones/rules).

diff --git a/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf b/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
index 3eeb5bcffb8749af828529d911412b6dfa1b6475..c9ad7c0a35fa4faaa7412568e6c6ec7b014c52be 100644 (file)
--- a/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
@@ -124,6 +124,7 @@ key "peep_bo_sns-user_ns" {
 };
 
 acl internal_networks  { 2001:1aa1:000a:7dae::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl linuxone_network   { 172.24.121/24; };
 acl vpn_client_network { 172.24.232.0/24; };
 acl source_ns_key_acl  { key "source_ns-internal_ns1"; };
 acl peep_bo_sns_key_acl        { key "peep_bo_sns-user_ns"; };
@@ -135,13 +136,13 @@ server 10.228.109.11              { keys { "source_ns-internal_ns1"; }; };
 server 10.162.109.11           { keys { "peep_bo_sns-user_ns"; }; };
 
 view "internal" {
-       match-clients           { internal_networks; vpn_client_network; localhost; source_ns_key_acl; peep_bo_sns_key_acl; };
+       match-clients           { internal_networks; linuxone_network; vpn_client_network; localhost; source_ns_key_acl; peep_bo_sns_key_acl; };
 
        recursion               yes;
 
-       allow-query             { internal_networks; vpn_client_network; localhost; };
-       allow-query-cache       { internal_networks; vpn_client_network; localhost; };
-       allow-recursion         { internal_networks; vpn_client_network; localhost; };
+       allow-query             { internal_networks; linuxone_network; vpn_client_network; localhost; };
+       allow-query-cache       { internal_networks; linuxone_network; vpn_client_network; localhost; };
+       allow-recursion         { internal_networks; linuxone_network; vpn_client_network; localhost; };
 
        allow-notify            { source_ns_key_acl; peep_bo_sns_key_acl; };
        notify                  no;
@@ -189,6 +190,16 @@ view "internal" {
                primaries { source_ns_primary; };
                file "slaves/b.6.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
+       zone "l1.useribm.hu" IN {
+               type slave;
+               primaries { source_ns_primary; };
+               file "slaves/l1.useribm.hu.zone";
+       };
+       zone "121.24.172.in-addr.arpa" IN {
+               type slave;
+               primaries { source_ns_primary; };
+               file "slaves/121.24.172.in-addr.arpa.zone";
+       };
        zone "sr.user.hu" IN {
                type slave;
                primaries { source_ns_primary; };

diff --git a/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf b/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
index 00374cd209e375c339ebf3ba3ab8a8d467886911..88ea38b84bfe31c2d7a1dae31952e0b331cbe30a 100644 (file)
--- a/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
@@ -124,6 +124,7 @@ key "peep_bo_sns-user_ns" {
 };
 
 acl internal_networks  { 2001:1aa1:000a:7dae::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl linuxone_network   { 172.24.121/24; };
 acl vpn_client_network { 172.24.232.0/24; };
 acl source_ns_key_acl  { key "source_ns-internal_ns2"; };
 acl peep_bo_sns_key_acl        { key "peep_bo_sns-user_ns"; };
@@ -135,13 +136,13 @@ server 10.228.109.11              { keys { "source_ns-internal_ns2"; }; };
 server 10.162.109.11           { keys { "peep_bo_sns-user_ns"; }; };
 
 view "internal" {
-       match-clients           { internal_networks; vpn_client_network; localhost; source_ns_key_acl; peep_bo_sns_key_acl; };
+       match-clients           { internal_networks; linuxone_network; vpn_client_network; localhost; source_ns_key_acl; peep_bo_sns_key_acl; };
 
        recursion               yes;
 
-       allow-query             { internal_networks; vpn_client_network; localhost; };
-       allow-query-cache       { internal_networks; vpn_client_network; localhost; };
-       allow-recursion         { internal_networks; vpn_client_network; localhost; };
+       allow-query             { internal_networks; linuxone_network; vpn_client_network; localhost; };
+       allow-query-cache       { internal_networks; linuxone_network; vpn_client_network; localhost; };
+       allow-recursion         { internal_networks; linuxone_network; vpn_client_network; localhost; };
 
        allow-notify            { source_ns_key_acl; peep_bo_sns_key_acl; };
        notify                  no;
@@ -189,6 +190,16 @@ view "internal" {
                primaries { source_ns_primary; };
                file "slaves/b.6.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
+       zone "l1.useribm.hu" IN {
+               type slave;
+               primaries { source_ns_primary; };
+               file "slaves/l1.useribm.hu.zone";
+       };
+       zone "121.24.172.in-addr.arpa" IN {
+               type slave;
+               primaries { source_ns_primary; };
+               file "slaves/121.24.172.in-addr.arpa.zone";
+       };
        zone "sr.user.hu" IN {
                type slave;
                primaries { source_ns_primary; };