[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-24-g3b1368a

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 2fef55e06818c8878b612bc04efcb808ebd769e7
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Aug 19 00:51:54 2012 +0200

    Move apt proxy configuration from 'scripts' to 'files'.
    
    The apt configuration files are fcopy'd at the very beginning of the
    installation.

diff --git a/fai/config/files/etc/apt/apt.conf/CLIENT_A b/fai/config/files/etc/apt/apt.conf/CLIENT_A
new file mode 100644
index 0000000..f1175e0
--- /dev/null
+++ b/fai/config/files/etc/apt/apt.conf/CLIENT_A
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://aptcache.intern:3142/";
diff --git a/fai/config/files/etc/apt/apt.conf/SERVER_A b/fai/config/files/etc/apt/apt.conf/SERVER_A
new file mode 100644
index 0000000..f1175e0
--- /dev/null
+++ b/fai/config/files/etc/apt/apt.conf/SERVER_A
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://aptcache.intern:3142/";
diff --git a/fai/config/scripts/CLIENT_A/20-misc b/fai/config/scripts/CLIENT_A/20-misc
index a65480a..1464b64 100755
--- a/fai/config/scripts/CLIENT_A/20-misc
+++ b/fai/config/scripts/CLIENT_A/20-misc
@@ -5,11 +5,6 @@ set -e
 ## faiconfig:
 fcopy -ir /etc/fai
 
-## Use apt-cacher-ng as proxy for APT:
-cat > $target/etc/apt/apt.conf.d/proxy <<EOF
-Acquire::http::Proxy "http://aptcache.intern:3142/";
-EOF
-
 ## Fetch proxy information from wpad.dat:
 WPAD=/tmp/wpad.dat
 http_proxy=""; wget --output-document=$WPAD http://wpad.intern/wpad.dat
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 4414c1d..30411e1 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -16,11 +16,6 @@ fi
 
 fcopy -m root,root,0700 /usr/sbin/debian-lan
 
-## Use apt-cacher-ng as proxy for APT:
-cat > $target/etc/apt/apt.conf.d/proxy <<EOF
-Acquire::http::Proxy "http://aptcache.intern:3142/";
-EOF
-
 if [ $FAI_ACTION != "install" ]; then
     exit 0
 fi

-- 
Debian-LAN development and packaging