[D-community-commits] r177 - in trunk/fai-config-dir: class files/etc/apt/sources.list package_config scripts scripts/DEBIANEDU

[h01ger-guest at alioth.debian.org]

Author: h01ger-guest
Date: 2007-12-04 20:31:13 +0000 (Tue, 04 Dec 2007)
New Revision: 177

Added:
   trunk/fai-config-dir/scripts/DEBIANEDU/
   trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey
Modified:
   trunk/fai-config-dir/class/50-host-classes
   trunk/fai-config-dir/files/etc/apt/sources.list/bikeshed
   trunk/fai-config-dir/package_config/MAILSERVER
Log:
- add debian-edu repo to sources.list
- add debian-edu gpg-key for apt with a trustpath
- install lwat


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

Modified: trunk/fai-config-dir/files/etc/apt/sources.list/bikeshed
===================================================================
--- trunk/fai-config-dir/files/etc/apt/sources.list/bikeshed	2007-12-02 16:20:23 UTC (rev 176)
+++ trunk/fai-config-dir/files/etc/apt/sources.list/bikeshed	2007-12-04 20:31:13 UTC (rev 177)
@@ -5,6 +5,10 @@
 deb http://security.eu.debian.org/ etch/updates main
 deb-src http://security.eu.debian.org/ etch/updates main
 
+# for fai backport
 deb http://layer-acht.org/debian etch fai backports
 deb-src http://layer-acht.org/debian etch fai backports
 
+# debian-edu repo, mainly for lwat and ldap
+deb http://ftp.skolelinux.org/skolelinux etch local
+deb-src http://ftp.skolelinux.org/skolelinux etch local

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

Added: trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey
===================================================================
--- trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey	                        (rev 0)
+++ trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey	2007-12-04 20:31:13 UTC (rev 177)
@@ -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
+}
+


Property changes on: trunk/fai-config-dir/scripts/DEBIANEDU/10-addaptkey
___________________________________________________________________
Name: svn:executable
   + *