[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-11-g693c2f3

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 9a8cd12e44d6017afaed1251186593e0c6e088ef
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Jan 26 00:07:22 2013 +0100

    Move apt proxy configuration to scripts.
    
    The proxy is not available during installation, so switch it on after
    packages have been downloaded and installed (cf. #682796).  In
    addition, this simplifies converting an existing minimal installation.

diff --git a/fai/config/files/etc/apt/apt.conf/SERVER_A b/fai/config/files/etc/apt/apt.conf/SERVER_A
deleted file mode 100644
index f1175e0..0000000
--- a/fai/config/files/etc/apt/apt.conf/SERVER_A
+++ /dev/null
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://aptcache.intern:3142/";
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index a5bbea6..22e776f 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -2,6 +2,9 @@
 
 set -e
 
+## Switch on apt-cacher-ng:
+ainsl -a /etc/apt/apt.conf 'Acquire::http::Proxy "http://aptcache.intern:3142/";'
+
 ## Add a local user account.
 ## You need to define USERNAME in class/SERVER_A.var to enable:
 

-- 
Debian-LAN development and packaging