[Fai-commit] r6218 - in branches/stable/3.4/examples/simple: files/etc files/etc/approx files/etc/approx/approx.conf files/etc/apt-proxy/apt-proxy-v2.conf files/etc/fai/apt/sources.list files/etc/fai/make-fai-nfsroot.conf files/etc/rc2.d/S99fai-setup package_config scripts/FAISERVER
Michael Prokop
mika at alioth.debian.org
Tue Nov 30 22:40:57 UTC 2010
Author: mika
Date: 2010-11-30 22:40:57 +0000 (Tue, 30 Nov 2010)
New Revision: 6218
Added:
branches/stable/3.4/examples/simple/files/etc/approx/
branches/stable/3.4/examples/simple/files/etc/approx/approx.conf/
branches/stable/3.4/examples/simple/files/etc/approx/approx.conf/FAISERVER
Modified:
branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER
branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
branches/stable/3.4/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
branches/stable/3.4/examples/simple/package_config/FAISERVER
branches/stable/3.4/examples/simple/scripts/FAISERVER/10-conffiles
Log:
simple examples: move from apt-proxy to approx
Last Debian release that provides apt-proxy is lenny,
therefore switch to approx instead which is available since
etch in each Debian release.
Patch provided by Thomas Lange.
Signed-off-by: Michael Prokop <mika at grml.org>
Added: branches/stable/3.4/examples/simple/files/etc/approx/approx.conf/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/approx/approx.conf/FAISERVER (rev 0)
+++ branches/stable/3.4/examples/simple/files/etc/approx/approx.conf/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -0,0 +1,3 @@
+debian http://cdn.debian.net/debian
+security http://security.debian.org/debian-security
+cskoeln http://fai-project.org/download
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-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/files/etc/apt-proxy/apt-proxy-v2.conf/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -1,132 +0,0 @@
-[DEFAULT]
-;; All times are in seconds, but you can add a suffix
-;; for minutes(m), hours(h) or days(d)
-
-;; Server IP to listen on
-;address = 192.168.0.254
-
-;; Server port to listen on
-port = 9999
-
-;; Control files (Packages/Sources/Contents) refresh rate
-;;
-;; Minimum age of a file before it is refreshed
-min_refresh_delay = 1h
-
-;; Minimum age of a file before attempting an update (NOT YET IMPLEMENTED)
-;min_age = 23h
-
-;; Uncomment to make apt-proxy continue downloading even if all
-;; clients disconnect. This is probably not a good idea on a
-;; dial up line.
-;; complete_clientless_downloads = 1
-
-;; Debugging settings.
-;; for all debug information use this:
-;; debug = all:9
-debug = all:4 db:0
-
-;; Debugging remote python console
-;; Do not enable in an untrusted environment
-;telnet_port = 9998
-;telnet_user = apt-proxy
-;telnet_password = secret
-
-;; Network timeout when retrieving from backend servers
-timeout = 15
-
-;; Cache directory for apt-proxy
-cache_dir = /var/cache/apt-proxy
-
-;; Use passive FTP? (default=on)
-;passive_ftp = on
-
-;; Use HTTP proxy?
-;http_proxy = [username:password@]host:port
-
-;; Limit download rate from backend servers (http and rsync only), in bytes/sec
-;bandwidth_limit = 100000
-
-;;--------------------------------------------------------------
-;; Cache housekeeping
-
-;; Time to perform periodic housekeeping:
-;; - delete files that have not been accessed in max_age
-;; - scan cache directories and update internal tables
-cleanup_freq = 1d
-
-;; Maximum age of files before deletion from the cache (seconds)
-max_age = 120d
-
-;; Maximum number of versions of a .deb to keep per distribution
-max_versions = 3
-
-;; Add HTTP backends dynamicaly if not already defined? (default=on)
-;dynamic_backends = on
-
-;;---------------------------------------------------------------
-;;---------------------------------------------------------------
-;; Backend servers
-;;
-;; Place each server in its own [section]
-
-[debian]
-;; The main Debian archive
-;; You can override the default timeout like this:
-;timeout = 30
-
-;; Backend servers, in order of preference
-backends =
- http://cdn.debian.net/debian
- http://ftp.de.debian.org/debian
- http://ftp2.de.debian.org/debian
- ftp://ftp.uk.debian.org/debian
-
-min_refresh_delay = 1d
-
-[security]
-;; Debian security archive
-backends =
- http://security.debian.org/debian-security
- http://ftp2.de.debian.org/debian-security
-
-min_refresh_delay = 1m
-
-[ubuntu]
-;; Ubuntu archive
-backends = http://archive.ubuntu.com/ubuntu
-min_refresh_delay = 15m
-
-[ubuntu-security]
-;; Ubuntu security updates
-backends = http://security.ubuntu.com/ubuntu
-min_refresh_delay = 1m
-
-;[backports.org]
-;; backports.org
-;backends = http://backports.org/debian
-min_refresh_delay = 1d
-
-;[blackdown]
-;; Blackdown Java
-;backends = http://ftp.gwdg.de/pub/languages/java/linux/debian
-min_refresh_delay = 1d
-
-;[debian-people]
-;; people.debian.org
-;backends = http://people.debian.org
-
-;[emdebian]
-;; The Emdebian project
-;backends = http://emdebian.sourceforge.net/emdebian
-
-;[rsync]
-;; An example using an rsync server. This is not recommended
-;; unless http is not available, becuause rsync is only more
-;; efficient for transferring uncompressed files and puts much
-;; more overhead on the server.
-;backends = rsync://ftp.uk.debian.org/debian
-
-;[gnuab]
-;; Debian GNU/Hurd-related tools
-;backends = http://ftp.gnuab.org/debian
Modified: branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER 2010-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/files/etc/fai/apt/sources.list/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -3,6 +3,6 @@
#deb http://faiserver/debian squeeze/updates main
#deb http://faiserver/debian-security squeeze/updates main contrib non-free
-# via apt-proxy
+# via approx
deb http://faiserver:9999/debian squeeze main contrib non-free
deb http://faiserver:9999/security squeeze/updates main contrib non-free
Modified: branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2010-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -16,7 +16,7 @@
NFSROOT_ETC_HOSTS="192.168.1.250 faiserver"
# Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="squeeze http://faiserver/debian"
+FAI_DEBOOTSTRAP="squeeze http://faiserver:9999/debian"
# the encrypted (with md5 or crypt) root password on all install clients during
# installation process; used when log in via ssh; default pw is: fai
Modified: branches/stable/3.4/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2010-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -17,7 +17,6 @@
ip addr add 192.168.1.250 dev eth0 # (fixed address of faiserver)
/etc/init.d/nscd restart
/etc/init.d/apache2 restart
-/etc/init.d/apt-proxy restart
fai-setup -v 2>&1 | tee /var/log/fai-setup.log
Modified: branches/stable/3.4/examples/simple/package_config/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/package_config/FAISERVER 2010-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/package_config/FAISERVER 2010-11-30 22:40:57 UTC (rev 6218)
@@ -5,5 +5,5 @@
debmirror tcpdump
apache2
genisoimage mkisofs grub
-apt-proxy lftp
+approx lftp
syslinux-common
Modified: branches/stable/3.4/examples/simple/scripts/FAISERVER/10-conffiles
===================================================================
--- branches/stable/3.4/examples/simple/scripts/FAISERVER/10-conffiles 2010-11-30 22:40:53 UTC (rev 6217)
+++ branches/stable/3.4/examples/simple/scripts/FAISERVER/10-conffiles 2010-11-30 22:40:57 UTC (rev 6218)
@@ -3,7 +3,7 @@
fcopy -Bv /etc/dhcp3/dhcpd.conf /etc/default/tftpd-hpa # not needed /etc/apache2/conf.d
fcopy -Bvr /etc/fai
-fcopy /etc/apt-proxy/apt-proxy-v2.conf /etc/fai/apt/sources.list
+fcopy /etc/fai/apt/sources.list /etc/approx.conf
if [ $FAI_ACTION = "install" ]; then
More information about the Fai-commit
mailing list