[Fai-commit] r5941 - in trunk: debian examples/simple/files/etc examples/simple/files/etc/approx examples/simple/files/etc/approx/approx.conf examples/simple/files/etc/fai/apt/sources.list examples/simple/scripts/FAISERVER

[Thomas Lange]

Author: lange
Date: 2010-08-05 23:31:45 +0000 (Thu, 05 Aug 2010)
New Revision: 5941

Added:
   trunk/examples/simple/files/etc/approx/
   trunk/examples/simple/files/etc/approx/approx.conf/
   trunk/examples/simple/files/etc/approx/approx.conf/FAISERVER
Modified:
   trunk/debian/changelog
   trunk/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
   trunk/examples/simple/scripts/FAISERVER/10-conffiles
Log:
add approx support in class FAISERVER

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-08-04 04:13:46 UTC (rev 5940)
+++ trunk/debian/changelog	2010-08-05 23:31:45 UTC (rev 5941)
@@ -1,4 +1,4 @@
-fai (3.4~beta23) unstable; urgency=low
+fai (3.4~beta25) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -113,6 +113,7 @@
   * remove apt-proxy
   * use 192.168.33.0/24 subnet for class FAISERVER
   * S99fai-setup: do not call fai-setup
+  * add approx support in class FAISERVER
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3
@@ -190,7 +191,7 @@
     if the shortname has no match in device.map. Needed now that grub2 in
     unstable has switched to using stable names in device.map.
   
- -- Thomas Lange <lange at debian.org>  Mon, 02 Aug 2010 20:29:43 -0400
+ -- Thomas Lange <lange at debian.org>  Thu, 05 Aug 2010 19:31:41 -0400
 
 fai (3.3.5) unstable; urgency=high
 

Added: trunk/examples/simple/files/etc/approx/approx.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/approx/approx.conf/FAISERVER	                        (rev 0)
+++ trunk/examples/simple/files/etc/approx/approx.conf/FAISERVER	2010-08-05 23:31:45 UTC (rev 5941)
@@ -0,0 +1,3 @@
+debian         http://cdn.debian.net/debian
+security       http://security.debian.org/debian-security
+cskoeln        http://www.informatik.uni-koeln.de/fai/download

Modified: trunk/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/apt/sources.list/FAISERVER	2010-08-04 04:13:46 UTC (rev 5940)
+++ trunk/examples/simple/files/etc/fai/apt/sources.list/FAISERVER	2010-08-05 23:31:45 UTC (rev 5941)
@@ -1,8 +1,4 @@
-# via local partial mirror (was mirror on fai-cd)
-deb http://faiserver/debian lenny main 
-#deb http://faiserver/debian lenny/updates main
-#deb http://faiserver/debian-security lenny/updates main contrib non-free
-
-# via apt-proxy
+# via approx
 deb http://faiserver:9999/debian lenny main contrib non-free
 deb http://faiserver:9999/security lenny/updates main contrib non-free
+deb http://faiserver:9999/cskoeln lenny koeln

Modified: trunk/examples/simple/scripts/FAISERVER/10-conffiles
===================================================================
--- trunk/examples/simple/scripts/FAISERVER/10-conffiles	2010-08-04 04:13:46 UTC (rev 5940)
+++ trunk/examples/simple/scripts/FAISERVER/10-conffiles	2010-08-05 23:31:45 UTC (rev 5941)
@@ -2,9 +2,8 @@
 
 fcopy -Bv /etc/dhcp3/dhcpd.conf /etc/default/tftpd-hpa # not needed /etc/apache2/conf.d
 fcopy -Bvr /etc/fai
+fcopy /etc/fai/apt/sources.list /etc/approx.conf
 
-fcopy /etc/fai/apt/sources.list
-
 if [ $FAI_ACTION = "install" ]; then
 
     # use the same sources.list for the server itself and the clients