[Fai-commit] r5968 - in branches/stable/3.4: conf debian examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:52:22 +0000 (Tue, 17 Aug 2010)
New Revision: 5968

Modified:
   branches/stable/3.4/conf/sources.list
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER
Log:
sources.list: fix security.geo.debian.org domain entries


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/conf/sources.list
===================================================================
--- branches/stable/3.4/conf/sources.list	2010-08-17 12:52:02 UTC (rev 5967)
+++ branches/stable/3.4/conf/sources.list	2010-08-17 12:52:22 UTC (rev 5968)
@@ -2,7 +2,7 @@
 # A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
 
 deb http://cdn.debian.net/debian lenny main contrib non-free
-deb http://security.geo.debian.org/debian-security lenny/updates main contrib non-free
+deb http://security.debian.org/debian-security lenny/updates main contrib non-free
 
 # repository that may contain newer fai packages for lenny
 #deb http://www.informatik.uni-koeln.de/fai/download lenny koeln

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:52:02 UTC (rev 5967)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:52:22 UTC (rev 5968)
@@ -4,6 +4,7 @@
   * make-fai-nfsroot: fix typo
   * mkramdisk: use exit in main routine (closes: #583289)
   * ainsl: exit with 0 if line already exists in the file
+  * sources.list: fix security.geo.debian.org domain entries
 
  -- Thomas Lange <lange at debian.org>  Mon, 31 May 2010 16:50:25 +0200
 

Modified: branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER	2010-08-17 12:52:02 UTC (rev 5967)
+++ branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER	2010-08-17 12:52:22 UTC (rev 5968)
@@ -87,7 +87,7 @@
 [security]
 ;; Debian security archive
 backends = 
-	http://security.geo.debian.org/debian-security
+	http://security.debian.org/debian-security
 	http://ftp2.de.debian.org/debian-security
 
 min_refresh_delay = 1m