[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-7-ga1fc02e

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit a1fc02ec4ec168c167832a2e87cc31c015940e41
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Mar 31 22:48:59 2013 +0200

    Fix permissions for public key.  Enable repo for the 'mainserver'.
    
    The public key for the APT repository needs to be readable by
    www-data.  Enable the repository for the 'mainserver' too.
    
    Thanks to Andreas Schockenhoff for testing and debugging the issue.

diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index c8fddf3..43e82f1 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -59,6 +59,9 @@ DL_RANGE="150 249"
 ## Local APT repository for the site (accessible via http).
 ## Set empty to skip this feature.
 APT_REPO_DIR="/var/www/debian/"
+## URL of the local site's APT repository.
+## Set empty to skip this feature.
+APT_URL="http://www.intern/debian/"
 
 # MODULESLIST contains modules that will be loaded by the new system,
 # not during installation these modules will be written to /etc/modules
diff --git a/fai/config/scripts/CLIENT_A/30-APTrepository b/fai/config/scripts/CLIENT_A/30-APTrepo_client
similarity index 100%
copy from fai/config/scripts/CLIENT_A/30-APTrepository
copy to fai/config/scripts/CLIENT_A/30-APTrepo_client
diff --git a/fai/config/scripts/SERVER_A/60-APTrepository b/fai/config/scripts/SERVER_A/60-APTrepo_server
similarity index 97%
rename from fai/config/scripts/SERVER_A/60-APTrepository
rename to fai/config/scripts/SERVER_A/60-APTrepo_server
index d30aa65..a907dac 100755
--- a/fai/config/scripts/SERVER_A/60-APTrepository
+++ b/fai/config/scripts/SERVER_A/60-APTrepo_server
@@ -106,8 +106,8 @@ fi
 
 ## Create archive, make sure all packages are readable by www-data:
 
-chgrp www-data pool/main/*.deb
-chmod g+r      pool/main/*.deb
+chgrp www-data pool/main/*.deb DebianLAN.pubkey
+chmod g+r      pool/main/*.deb DebianLAN.pubkey
 
 FILE=dists/stable/Release
 apt-ftparchive generate -c=aptftp.conf aptgenerate.conf
diff --git a/fai/config/scripts/CLIENT_A/30-APTrepository b/fai/config/scripts/SERVER_A/65-APTrepo_client
similarity index 100%
rename from fai/config/scripts/CLIENT_A/30-APTrepository
rename to fai/config/scripts/SERVER_A/65-APTrepo_client

-- 
Debian-LAN development and packaging