[Debconf-video-commits] r271 - in fai-config: class files/etc/kde3/kdm/kdmrc scripts scripts/DEBCONF scripts/DEBCONF8

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-23 17:28:58 +0000 (Sat, 23 Aug 2008)
New Revision: 271

Added:
   fai-config/scripts/DEBCONF8/20-admin
   fai-config/scripts/DEBCONF8/30-postfix
Removed:
   fai-config/class/27-debconf7-classes
   fai-config/scripts/DEBCONF/10-admin
   fai-config/scripts/DEBCONF/15-postfix
   fai-config/scripts/DEBCONF7/
Modified:
   fai-config/class/28-debconf8-classes
   fai-config/files/etc/kde3/kdm/kdmrc/XORG
Log:
remove the very most traces of debconf7, move stuff that is relevant for machines at the local venue only to the DEBCONF8 class

Deleted: fai-config/class/27-debconf7-classes
===================================================================
--- fai-config/class/27-debconf7-classes	2008-08-23 17:03:37 UTC (rev 270)
+++ fai-config/class/27-debconf7-classes	2008-08-23 17:28:58 UTC (rev 271)
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-exit 0
-
-# some classes for all hosts
-echo "FAIBASE DEBCONF VIDEO" 
-
-# assign classes for hosts at debconf7
-case `hostname -f` in
-   *.dc7.debconf.org)
-		echo "DEBCONF7" ;;
-esac
-
-case $HOSTNAME in
-   mickey|daffy|donald) 
-   		echo "ENCODING";;
-   selma|mrwhite) 
-   		echo "BRIDGE";;
-esac
-case $HOSTNAME in
-   selma|shadow|hashbaz|patty|mrwhite|itchy|scratchy) 
-   		echo "CAPTURE";;
-esac
-case $HOSTNAME in
-   selma|mrwhite|itchy|scratchy) 
-   		echo "DVSWITCH";;
-esac
-
-
-# temp. fileserver
-case $HOSTNAME in
-   abe) 
-   		echo "ENCODING";;
-esac
-

Modified: fai-config/class/28-debconf8-classes
===================================================================
--- fai-config/class/28-debconf8-classes	2008-08-23 17:03:37 UTC (rev 270)
+++ fai-config/class/28-debconf8-classes	2008-08-23 17:28:58 UTC (rev 271)
@@ -1,7 +1,12 @@
 #! /bin/sh
 
 # assign classes for hosts at debconf8
-# `hostname -f` doesnt return proper results
+# `hostname -f` doesnt return proper results (before running fai :)
+
+#
+# the class DEBCONF8 is reserved for machines at the venue...
+#
+
 case $HOSTNAME in
    selma|patty|itchy|scratchy|daffy|barney|mrwhite|lisa|marge)
 		echo "FAIBASE DEBCONF DEBCONF8 VIDEO" ;;
@@ -39,10 +44,10 @@
    		echo "DVSWITCHPUBKEY";;
 esac
 
-# post-processing after debconf8 at home
+# post-processing after debconf8 at home, do not define DEBCONF8 here
 case $HOSTNAME in
    io)
-		echo "FAIBASE DEBCONF DEBCONF8 VIDEO ENCODING STORAGE" ;;
+		echo "FAIBASE DEBCONF VIDEO ENCODING STORAGE" ;;
 esac
 
 

Modified: fai-config/files/etc/kde3/kdm/kdmrc/XORG
===================================================================
--- fai-config/files/etc/kde3/kdm/kdmrc/XORG	2008-08-23 17:03:37 UTC (rev 270)
+++ fai-config/files/etc/kde3/kdm/kdmrc/XORG	2008-08-23 17:28:58 UTC (rev 271)
@@ -30,7 +30,7 @@
 FailFont=Sans Serif,10,-1,5,75,0,0,0,0,0
 GUIStyle=
 GreetFont=Sans Serif,22,-1,5,50,0,0,0,0,0
-GreetString=Welcome to DebConf7 at %n
+GreetString=Welcome to %n
 GreeterPos=50,50
 HiddenUsers=
 Language=en_US

Deleted: fai-config/scripts/DEBCONF/10-admin
===================================================================
--- fai-config/scripts/DEBCONF/10-admin	2008-08-23 17:03:37 UTC (rev 270)
+++ fai-config/scripts/DEBCONF/10-admin	2008-08-23 17:28:58 UTC (rev 271)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-#fcopy -M /etc/nsswitch.conf
-fcopy -m root,root,440 /etc/sudoers
-
-ud-replicate

Deleted: fai-config/scripts/DEBCONF/15-postfix
===================================================================
--- fai-config/scripts/DEBCONF/15-postfix	2008-08-23 17:03:37 UTC (rev 270)
+++ fai-config/scripts/DEBCONF/15-postfix	2008-08-23 17:28:58 UTC (rev 271)
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-#
-#        (c) 2008 Holger Levsen         holger at layer-acht.org
-#        GPL2 licenced
-#
-
-# don't restart postfix twice for the MAILSERVER
-ifclass MAILSERVER && exit 0
-
-fcopy -r -M /etc/postfix
-$ROOTCMD postmap /etc/postfix/virtual_alias
-$ROOTCMD /etc/init.d/postfix restart
-

Copied: fai-config/scripts/DEBCONF8/20-admin (from rev 238, fai-config/scripts/DEBCONF/10-admin)
===================================================================
--- fai-config/scripts/DEBCONF8/20-admin	                        (rev 0)
+++ fai-config/scripts/DEBCONF8/20-admin	2008-08-23 17:28:58 UTC (rev 271)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+#fcopy -M /etc/nsswitch.conf
+fcopy -m root,root,440 /etc/sudoers
+
+ud-replicate

Copied: fai-config/scripts/DEBCONF8/30-postfix (from rev 238, fai-config/scripts/DEBCONF/15-postfix)
===================================================================
--- fai-config/scripts/DEBCONF8/30-postfix	                        (rev 0)
+++ fai-config/scripts/DEBCONF8/30-postfix	2008-08-23 17:28:58 UTC (rev 271)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+#
+#        (c) 2008 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+# don't restart postfix twice for the MAILSERVER
+ifclass MAILSERVER && exit 0
+
+fcopy -r -M /etc/postfix
+$ROOTCMD postmap /etc/postfix/virtual_alias
+$ROOTCMD /etc/init.d/postfix restart
+