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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit deb4eb9ac4353abe8433477d4f5b9e15e82e02c8
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Mon Apr 9 23:12:10 2012 +0200

    Remove INT/EXT_GATEWAY class completely.  Document changes.
    
    If $MAINSERVER_IPADDR and $GATEWAY are identical, configure the
    mainserver as gateway to the external network.
    Because eth0 is the internal network in both cases now, preseeding
    isc-dhcp-server is fine for both setups.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 9a21bb7..10ed896 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -12,7 +12,8 @@
 ##
 ##   Mainserver variants (cf. wiki documentation):
 ##
-##     INT_GATEWAY | EXT_GATEWAY  -->  internal/external gateway
+##     The network configuration (cf. 'class/SERVER_A.var') determines
+##     if the mainserver acts as gateway to the external network.
 ##
 ##     *LVM6_A | *LVM7_A DISKLESS_SERVER  -->  diskless client server
 ##
@@ -20,7 +21,7 @@
 ##
 
 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 INT_GATEWAY"
+LDAP_CLIENT LDAP_SERVER KERBEROS_CLIENT KERBEROS_KDC KDC_LDAP SERVER_A"
 
 WORKSTATION_A="LVM5_A LOG_CLIENT LDAP_CLIENT NFS_CLIENT KERBEROS_CLIENT CLIENT_A"
 
diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index ec65040..01e7e04 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -30,7 +30,10 @@ KDC_MASTER_PW=
 ## created and saved in $DATADIR.
 LDAP_ADMIN_PW=
 
-## Variables that define the network:
+## Variables that define the network.  If you choose the same IP
+## address for mainserver ($MAINSERVER_IPADDR) and gateway ($GATEWAY),
+## the mainserver is configured as gateway to the external network.
+## You'll need two network cards in that case.
 MAINSERVER_IPADDR="10.0.0.1"
 NAMESERVER_IPADDR="10.0.0.1"
 BROADCAST="10.0.255.255"
diff --git a/fai/config/debconf/INT_GATEWAY b/fai/config/debconf/SERVER_A
similarity index 52%
rename from fai/config/debconf/INT_GATEWAY
rename to fai/config/debconf/SERVER_A
index 027bf4e..df40a9f 100644
--- a/fai/config/debconf/INT_GATEWAY
+++ b/fai/config/debconf/SERVER_A
@@ -1,2 +1,2 @@
 # Network interfaces on which the DHCP server should listen:
-isc-dhcp-server isc-dhcp-server/interfaces string eth1
+isc-dhcp-server isc-dhcp-server/interfaces string eth0

-- 
Debian-LAN development and packaging