[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-5-g457ca7c

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit d436132097a92e7b725a331c096453ada4b0bf79
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Mon Apr 30 10:51:58 2012 +0200

    Improve documentation.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 10ed896..8bb8e12 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -10,27 +10,33 @@
 ##   Setup A
 ##   =======
 ##
-##   Mainserver variants (cf. wiki documentation):
+##   Mainserver variants (FLAVOR) c.f. wiki documentation:
 ##
 ##     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
 ##
-##     LVM*_A | RAIDLVM*_A  -->  RAID1 (mirroring)
+##     LVM*_A | RAIDLVM*_A RAID -->  RAID1 (mirroring)
 ##
+##
+##   Example classes that might be added:
+##
+##     DEVTOOLS   optional development packages
+##     EDU        package selection for education
+##     GERMAN     localization class
+##
+
+FLAVOR="LVM6_A"
+#FLAVOR="RAIDLVM6_A RAID"
+#FLAVOR="LVM7_A DISKLESS_SERVER"
+#FLAVOR="RAIDLVM7_A RAID DISKLESS_SERVER"
 
-MAINSERVER_A="LVM6_A LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER \
+MAINSERVER_A="$FLAVOR LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER \
 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"
 
-
-## Setup B, not yet implemented:
-MAINSERVER_B="NTP_SERVER DNS_SERVER LDAP_SERVER KERBEROS_KDC SETUP_B"
-
-
-
 # Use a list of classes for your machine:
 case $HOSTNAME in
     faiserver)

-- 
Debian-LAN development and packaging