[debian-edu-commits] debian-edu/ 01/01: Remove trailing dots for subnet(00|01).intern zone setup and files.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Thu Nov 3 12:04:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-config.
commit d6b9cebb6f0d1c554d61b3e3d084f233895f80bc
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Thu Nov 3 13:02:42 2016 +0100
Remove trailing dots for subnet(00|01).intern zone setup and files.
These changes will allow consistent innetgr() usage also in subnets.
- Adjust ldap-bootstrap/gosa-server.ldif
- Rename etc/bind/db.subnet00.intern. -> etc/bind/db.subnet00.intern
- Rename etc/bind/db.subnet01.intern. -> etc/bind/db.subnet01.intern
- Adjust etc/bind/named.conf.ldap2zone
---
debian/changelog | 6 ++++
.../{db.subnet00.intern. => db.subnet00.intern} | 0
.../{db.subnet01.intern. => db.subnet01.intern} | 0
etc/bind/named.conf.ldap2zone | 8 ++---
ldap-bootstrap/gosa-server.ldif | 36 +++++++++++-----------
5 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e6c8f5..2fe1e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ debian-edu-config (1.917) UNRELEASED; urgency=medium
* Rename testsuite/xfree86 -> testsuite/xorg and adjust code to match Xorg.
* Add squid fix to share/debian-edu-config/tools/run-at-firstboot.
* sbin/debian-edu-pxeinstall: Adjust path / filename for PXE background image.
+ * Remove trailing dots for subnet(00|01).intern zone setup and files.
+ - Adjust ldap-bootstrap/gosa-server.ldif
+ - Rename etc/bind/db.subnet00.intern. -> etc/bind/db.subnet00.intern
+ - Rename etc/bind/db.subnet01.intern. -> etc/bind/db.subnet01.intern
+ - Adjust etc/bind/named.conf.ldap2zone
+ These changes will allow consistent innetgr() usage also in subnets.
-- Wolfgang Schweer <wschweer at arcor.de> Tue, 01 Nov 2016 20:50:16 +0100
diff --git a/etc/bind/db.subnet00.intern. b/etc/bind/db.subnet00.intern
similarity index 100%
rename from etc/bind/db.subnet00.intern.
rename to etc/bind/db.subnet00.intern
diff --git a/etc/bind/db.subnet01.intern. b/etc/bind/db.subnet01.intern
similarity index 100%
rename from etc/bind/db.subnet01.intern.
rename to etc/bind/db.subnet01.intern
diff --git a/etc/bind/named.conf.ldap2zone b/etc/bind/named.conf.ldap2zone
index 7dfc094..a6f7069 100644
--- a/etc/bind/named.conf.ldap2zone
+++ b/etc/bind/named.conf.ldap2zone
@@ -26,17 +26,17 @@ zone "intern" {
};
-zone "subnet00.intern." {
+zone "subnet00.intern" {
type master;
notify yes;
- file "/etc/bind/db.subnet00.intern.";
+ file "/etc/bind/db.subnet00.intern";
};
-zone "subnet01.intern." {
+zone "subnet01.intern" {
type master;
notify yes;
- file "/etc/bind/db.subnet01.intern.";
+ file "/etc/bind/db.subnet01.intern";
};
diff --git a/ldap-bootstrap/gosa-server.ldif b/ldap-bootstrap/gosa-server.ldif
index 2442d39..9fa98e4 100644
--- a/ldap-bootstrap/gosa-server.ldif
+++ b/ldap-bootstrap/gosa-server.ldif
@@ -55,17 +55,17 @@ mXRecord: 10 tjener.intern.
############# subnet00.intern-zone ###############
-dn: zoneName=subnet00.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: zoneName=subnet00.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
-zoneName: subnet00.intern.
+zoneName: subnet00.intern
relativeDomainName: @
dNSClass: IN
sOARecord: tjener.intern. root.tjener.intern. 1 3600 1800 720000 6400
nSRecord: tjener.intern.
mXRecord: 10 tjener.intern.
-dn: zoneName=0.168.192.in-addr.arpa.,zoneName=subnet00.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: zoneName=0.168.192.in-addr.arpa.,zoneName=subnet00.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
zoneName: 0.168.192.in-addr.arpa.
@@ -75,24 +75,24 @@ sOARecord: tjener.intern. root.tjener.intern. 1 3600 1800 720000 6400
nSRecord: tjener.intern.
mXRecord: 10 tjener.intern.
-###### ltspserver00 in subnet00.intern.
+###### ltspserver00 in subnet00.intern
-dn: relativeDomainName=ltspserver00,zoneName=subnet00.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=ltspserver00,zoneName=subnet00.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
-zoneName: subnet00.intern.
+zoneName: subnet00.intern
relativeDomainName: ltspserver00
-dn: relativeDomainName=ltspserver00,relativeDomainName=ltspserver00,zoneName=subnet00.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=ltspserver00,relativeDomainName=ltspserver00,zoneName=subnet00.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
-zoneName: subnet00.intern.
+zoneName: subnet00.intern
relativeDomainName: ltspserver00
aRecord: 192.168.0.254
-dn: relativeDomainName=254,relativeDomainName=ltspserver00,zoneName=subnet00.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=254,relativeDomainName=ltspserver00,zoneName=subnet00.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
@@ -102,17 +102,17 @@ pTRRecord: ltspserver00.subnet00.intern.
############# subnet01-zone ###############
-dn: zoneName=subnet01.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: zoneName=subnet01.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
-zoneName: subnet01.intern.
+zoneName: subnet01.intern
relativeDomainName: @
dNSClass: IN
sOARecord: tjener.intern. root.tjener.intern. 1 3600 1800 720000 6400
nSRecord: tjener.intern.
mXRecord: 10 tjener.intern.
-dn: zoneName=1.168.192.in-addr.arpa.,zoneName=subnet01.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: zoneName=1.168.192.in-addr.arpa.,zoneName=subnet01.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
zoneName: 1.168.192.in-addr.arpa.
@@ -122,24 +122,24 @@ sOARecord: tjener.intern. root.tjener.intern. 1 3600 1800 720000 6400
nSRecord: tjener.intern.
mXRecord: 10 tjener.intern.
-###### ltspserver01 in subnet01.intern.
+###### ltspserver01 in subnet01.intern
-dn: relativeDomainName=ltspserver01,zoneName=subnet01.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=ltspserver01,zoneName=subnet01.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
-zoneName: subnet01.intern.
+zoneName: subnet01.intern
relativeDomainName: ltspserver01
-dn: relativeDomainName=ltspserver01,relativeDomainName=ltspserver01,zoneName=subnet01.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=ltspserver01,relativeDomainName=ltspserver01,zoneName=subnet01.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
-zoneName: subnet01.intern.
+zoneName: subnet01.intern
relativeDomainName: ltspserver01
aRecord: 192.168.1.254
-dn: relativeDomainName=254,relativeDomainName=ltspserver01,zoneName=subnet01.intern.,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+dn: relativeDomainName=254,relativeDomainName=ltspserver01,zoneName=subnet01.intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: dNSZone
dNSClass: IN
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list