[D-community-commits] r178 - in trunk/fai-config-dir: class package_config scripts scripts/DEFAULT

[h01ger-guest at alioth.debian.org]

Author: h01ger-guest
Date: 2007-12-04 20:56:09 +0000 (Tue, 04 Dec 2007)
New Revision: 178

Added:
   trunk/fai-config-dir/scripts/DEFAULT/91-add-debian-edu-archive-key
Removed:
   trunk/fai-config-dir/scripts/DEBIANEDU/
Modified:
   trunk/fai-config-dir/class/50-host-classes
   trunk/fai-config-dir/package_config/MAILSERVER
Log:
DEBIANEDU is no special class anymore, just default. as soon will be using packages from backports.org

Modified: trunk/fai-config-dir/class/50-host-classes
===================================================================
--- trunk/fai-config-dir/class/50-host-classes	2007-12-04 20:31:13 UTC (rev 177)
+++ trunk/fai-config-dir/class/50-host-classes	2007-12-04 20:56:09 UTC (rev 178)
@@ -5,7 +5,7 @@
 # use a list of classes for our demo machine
 case $HOSTNAME in
     bikeshed)
-	echo 	"DEBIANEDU ADMINGROUP FIREWALL MAILSERVER WEBSERVER" ;;
+	echo 	"ADMINGROUP FIREWALL MAILSERVER WEBSERVER" ;;
     *)
 	echo "DEFAULT" ;;
 esac

Modified: trunk/fai-config-dir/package_config/MAILSERVER
===================================================================
--- trunk/fai-config-dir/package_config/MAILSERVER	2007-12-04 20:31:13 UTC (rev 177)
+++ trunk/fai-config-dir/package_config/MAILSERVER	2007-12-04 20:56:09 UTC (rev 178)
@@ -2,6 +2,4 @@
 postfix postfix-tls postfix-doc postgrey
 pop-before-smtp ca-certificates
 swaks
-
-PACKAGES aptitude-r DEBIANEDU
 lwat

Copied: trunk/fai-config-dir/scripts/DEFAULT/91-add-debian-edu-archive-key (from rev 177, trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey)
===================================================================
--- trunk/fai-config-dir/scripts/DEFAULT/91-add-debian-edu-archive-key	                        (rev 0)
+++ trunk/fai-config-dir/scripts/DEFAULT/91-add-debian-edu-archive-key	2007-12-04 20:56:09 UTC (rev 178)
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+#
+#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+# pub   1024D/A26FF456 2006-02-22 [expires: 2014-02-20]
+#       Key fingerprint = 726D 3C7D B15F 3E85 34DB  E933 FEB1 9998 A26F F456
+# uid                  Skolelinux Archive Automatic Signing Key <ftpmaster at skolelinux.org>
+# sub   1024g/F940A6D6 2006-02-22 [expires: 2014-02-20]
+
+KEYID=A26FF456
+gpg --fingerprint $KEYID |{
+	# install the debian-keyring securily:
+	aptitude install debian-keyring
+	# fetch the key insecurily:
+	gpg --keyserver pgpkeys.pca.dfn.de --recv-keys $KEYID
+	# check securily if the key is correct and add it to root's keyring if it is:
+	gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs $KEYID && gpg --export $KEYID | apt-key add - 
+	# update the list of available packages:
+	aptitude update
+}
+