From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Jun 2014 19:32:06 +0000 (+0200)
Subject: Update security apache config
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=6feeb15ef91124cbe110ef247a375e6e4c825aee;hp=bfc9d666d8733a5e53b8d0d351760a13b8c332eb;p=mirror%2Fdsa-puppet.git

Update security apache config
---

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index 685162e38..3507a08d8 100644
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<Directory /org/security.debian.org/ftp>
+<Directory /srv/ftp.root/debian-security>
    IndexOptions NameWidth=* +SuppressDescription
    Options +FollowSymLinks
    Options +Indexes
@@ -12,7 +12,7 @@
 
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
-   DocumentRoot /org/security.debian.org/ftp
+   DocumentRoot /srv/ftp.root/debian-security
    ServerPath /debian-security
    ServerName security.debian.org
    ServerAlias security.ipv6.debian.org
@@ -30,14 +30,14 @@
 
    Alias /debian-security /org/security.debian.org/ftp
 
-   <Directory /org/security.debian.org/ftp/pool>
+   <Directory /srv/ftp.root/debian-security/pool>
       <FilesMatch "\.(bz2|gz|deb|dsc|xz)$">
          ExpiresDefault "access plus 1 month"
          Header append Cache-Control "public"
       </FilesMatch>
    </Directory>
 
-   <Directory /org/security.debian.org/ftp/dists>
+   <Directory /srv/ftp.root/debian-security/dists>
       ExpiresDefault "access plus 1 seconds"
       Header append Cache-Control "public"
    </Directory>