[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 7f945cbb80106f3b5d67b402ab9117e6ef29ecd5
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sun Apr 8 15:16:57 2012 +0200

    Split gateway relevant content into extra class.
    
    It turned out that the modifications needed to use the mainserver in a
    network with external gateway concerns only a few files.  Use an extra
    class to define the network topology (internal/external gateway).

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 15af8c2..9a21bb7 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -6,9 +6,21 @@
 # specific to a given setup.  Use the SERVER_* or CLIENT_* class for
 # all setup-specific details.
 
-## Setup A, a minimalistic setup: 
+##
+##   Setup A
+##   =======
+##
+##   Mainserver variants (cf. wiki documentation):
+##
+##     INT_GATEWAY | EXT_GATEWAY  -->  internal/external gateway
+##
+##     *LVM6_A | *LVM7_A DISKLESS_SERVER  -->  diskless client server
+##
+##     LVM*_A | RAIDLVM*_A  -->  RAID1 (mirroring)
+##
+
 MAINSERVER_A="LVM6_A LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER \
-LDAP_CLIENT LDAP_SERVER KERBEROS_CLIENT KERBEROS_KDC KDC_LDAP SERVER_A"
+LDAP_CLIENT LDAP_SERVER KERBEROS_CLIENT KERBEROS_KDC KDC_LDAP SERVER_A INT_GATEWAY"
 
 WORKSTATION_A="LVM5_A LOG_CLIENT LDAP_CLIENT NFS_CLIENT KERBEROS_CLIENT CLIENT_A"
 
diff --git a/fai/config/debconf/SERVER_A b/fai/config/debconf/INT_GATEWAY
similarity index 100%
rename from fai/config/debconf/SERVER_A
rename to fai/config/debconf/INT_GATEWAY
diff --git a/fai/config/files/etc/bind/db.10.in-addr.arpa/SERVER_A b/fai/config/files/etc/bind/db.10.in-addr.arpa/INT_GATEWAY
similarity index 100%
rename from fai/config/files/etc/bind/db.10.in-addr.arpa/SERVER_A
rename to fai/config/files/etc/bind/db.10.in-addr.arpa/INT_GATEWAY
diff --git a/fai/config/files/etc/bind/db.intern/SERVER_A b/fai/config/files/etc/bind/db.intern/INT_GATEWAY
similarity index 100%
rename from fai/config/files/etc/bind/db.intern/SERVER_A
rename to fai/config/files/etc/bind/db.intern/INT_GATEWAY
diff --git a/fai/config/files/etc/dhcp/dhcpd.conf/FAISERVER b/fai/config/files/etc/dhcp/dhcpd.conf/INT_GATEWAY
similarity index 100%
rename from fai/config/files/etc/dhcp/dhcpd.conf/FAISERVER
rename to fai/config/files/etc/dhcp/dhcpd.conf/INT_GATEWAY
diff --git a/fai/config/files/etc/network/interfaces/SERVER_A b/fai/config/files/etc/network/interfaces/INT_GATEWAY
similarity index 100%
rename from fai/config/files/etc/network/interfaces/SERVER_A
rename to fai/config/files/etc/network/interfaces/INT_GATEWAY

-- 
Debian-LAN development and packaging