[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.5-2-g064d9f4

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 064d9f4b16643418d04e365f8342f724a9328a18
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sun Apr 8 15:30:23 2012 +0200

    Add files to be used for the network topology with external gateway.
    
    In the EXT_GATEWAY setup variant, the (external) gateway address is
    10.0.0.1, the mainserver has the address 10.0.0.10.

diff --git a/fai/config/files/etc/bind/db.10.in-addr.arpa/INT_GATEWAY b/fai/config/files/etc/bind/db.10.in-addr.arpa/EXT_GATEWAY
similarity index 99%
copy from fai/config/files/etc/bind/db.10.in-addr.arpa/INT_GATEWAY
copy to fai/config/files/etc/bind/db.10.in-addr.arpa/EXT_GATEWAY
index 379b8b8..741fa27 100644
--- a/fai/config/files/etc/bind/db.10.in-addr.arpa/INT_GATEWAY
+++ b/fai/config/files/etc/bind/db.10.in-addr.arpa/EXT_GATEWAY
@@ -7,7 +7,7 @@ $TTL 500
                                 6400 )  ; Minimum TTL
                         NS      mainserver.intern.
                         MX      10 mainserver.intern.
-1.0.0                   PTR     mainserver.intern.
+10.0.0                  PTR     mainserver.intern.
 50.0.0                  PTR     workstation00.intern.
 51.0.0                  PTR     workstation01.intern.
 52.0.0                  PTR     workstation02.intern.
diff --git a/fai/config/files/etc/bind/db.intern/INT_GATEWAY b/fai/config/files/etc/bind/db.intern/EXT_GATEWAY
similarity index 99%
copy from fai/config/files/etc/bind/db.intern/INT_GATEWAY
copy to fai/config/files/etc/bind/db.intern/EXT_GATEWAY
index 9b47cde..aa11951 100644
--- a/fai/config/files/etc/bind/db.intern/INT_GATEWAY
+++ b/fai/config/files/etc/bind/db.intern/EXT_GATEWAY
@@ -7,7 +7,7 @@ $TTL 500
                                 6400 )  ; Minimum TTL
                         NS      mainserver.intern.
                         MX      10 mainserver.intern.
-mainserver              A       10.0.0.1
+mainserver              A       10.0.0.10
 _ldap._tcp              SRV     100 0 389 mainserver.intern.
 _syslog._udp            SRV     100 0 514 mainserver.intern.
 _kerberos._udp          SRV     100 0 88  mainserver.intern.
diff --git a/fai/config/files/etc/dhcp/dhcpd.conf/INT_GATEWAY b/fai/config/files/etc/dhcp/dhcpd.conf/EXT_GATEWAY
similarity index 99%
copy from fai/config/files/etc/dhcp/dhcpd.conf/INT_GATEWAY
copy to fai/config/files/etc/dhcp/dhcpd.conf/EXT_GATEWAY
index 6b4a615..c82df10 100644
--- a/fai/config/files/etc/dhcp/dhcpd.conf/INT_GATEWAY
+++ b/fai/config/files/etc/dhcp/dhcpd.conf/EXT_GATEWAY
@@ -1,11 +1,11 @@
 # dhcpd.conf for SETUP_A
 
-option dhcp-max-message-size 2048; 
+option dhcp-max-message-size 2048;
 use-host-decl-names on;
 
 option routers 10.0.0.1;
 option domain-name "intern";
-option domain-name-servers 10.0.0.1;
+option domain-name-servers 10.0.0.10;
 option ntp-servers ntp;
 
 subnet 10.0.0.0 netmask 255.255.0.0 {
diff --git a/fai/config/files/etc/network/interfaces/EXT_GATEWAY b/fai/config/files/etc/network/interfaces/EXT_GATEWAY
new file mode 100644
index 0000000..db72282
--- /dev/null
+++ b/fai/config/files/etc/network/interfaces/EXT_GATEWAY
@@ -0,0 +1,13 @@
+# The loopback network interface
+auto lo
+iface lo inet loopback
+      dns-search intern
+
+# The internal network interface
+auto eth0
+iface eth0 inet static
+      address 10.0.0.10
+      netmask 255.255.0.0
+      broadcast 10.0.255.255
+      gateway 10.0.0.1
+

-- 
Debian-LAN development and packaging