From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 30 Jan 2017 18:08:11 +0000 (+0100)
Subject: merge directory setup into ftp-archive macro
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5ca50c9b083d9725ceb2b68ddfd6e4bfa3f75c4a;hp=6b838d7e34a256cdc13bb393771c502482d9d753;p=mirror%2Fdsa-puppet.git

merge directory setup into ftp-archive macro
---

diff --git a/modules/apache2/files/puppet-ftp-macros b/modules/apache2/files/puppet-ftp-macros
index e3c9a55f3..2796fec50 100644
--- a/modules/apache2/files/puppet-ftp-macros
+++ b/modules/apache2/files/puppet-ftp-macros
@@ -1,6 +1,12 @@
 <IfModule mod_headers.c>
   <IfModule mod_macro.c>
     <Macro ftp-archive $root>
+      <Directory $root>
+        Require all granted
+        IndexOptions NameWidth=* +SuppressDescription
+        Options +Indexes +FollowSymLinks
+        FileETag MTime Size
+      </Directory>
       <Directory $root/pool>
         <Files ?*>
           Header set Cache-Control "public, max-age=2592000"
@@ -19,3 +25,4 @@
     </Macro>
   </IfModule>
 </IfModule>
+# vim:set syn=apache:
diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index 5d2ac23eb..6f913b1e4 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -17,11 +17,6 @@
         LogLevel warn
         CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
 
-        <Directory /srv/mirrors/debian-debug>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
         Use ftp-archive /srv/mirrors/debian-debug
 </VirtualHost>
+# vim:set syn=apache:
diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 5a060ce20..9aa05af0f 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -17,12 +17,6 @@
         RedirectMatch "^/$" /debian-ports/
 
         Alias /debian-ports /srv/mirrors/debian-ports
-        <Directory /srv/mirrors/debian-ports>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
         Use ftp-archive /srv/mirrors/debian-ports
 
         Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
@@ -33,3 +27,4 @@
                 Options +FollowSymLinks
         </Directory>
 </VirtualHost>
+# vim:set syn=apache:
diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index dc96ff218..d4fbe9d86 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -3,14 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<Directory /srv/ftp.root/debian-security>
-   IndexOptions NameWidth=* +SuppressDescription
-   Options +FollowSymLinks
-   Options +Indexes
-   FileETag MTime Size
-   Require all granted
-</Directory>
-
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
    DocumentRoot /srv/ftp.root/debian-security
@@ -60,4 +52,4 @@
    ServerSignature On
 </VirtualHost>
 
-# vim: set ts=3 sw=3 et:
+# vim:set syn=apache: