From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Feb 2015 18:19:19 +0000 (+0100)
Subject: Make a template out of the security.d.o apache conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=28d845a146f1b7259134059db896e8ff8bcc32d1;p=mirror%2Fdsa-puppet.git

Make a template out of the security.d.o apache conf
---

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
deleted file mode 100644
index 5299f36aa..000000000
--- a/modules/roles/files/security_mirror/security.debian.org
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## 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
-</Directory>
-
-<VirtualHost *:80>
-   ServerAdmin debian-admin@debian.org
-   DocumentRoot /srv/ftp.root/debian-security
-   ServerPath /debian-security
-   ServerName security.debian.org
-   ServerAlias security.ipv6.debian.org
-   ServerAlias security.eu.debian.org
-   ServerAlias security.us.debian.org
-   ServerAlias security.na.debian.org
-   ServerAlias security.geo.debian.org
-   ServerAlias security-cdn.debian.org
-   ServerAlias security-cdn1.debian.org
-   ServerAlias security-cdn2.debian.org
-   ServerAlias security-nagios.debian.org
-
-   ExpiresActive On
-   ExpiresDefault "access plus 2 minutes"
-
-   Alias /debian-security /srv/ftp.root/debian-security
-
-   <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 /srv/ftp.root/debian-security/dists>
-      ExpiresDefault "access plus 1 seconds"
-      Header append Cache-Control "public"
-   </Directory>
-
-   RewriteEngine on
-   RewriteRule ^/$      http://www.debian.org/security/
-
-   # Possible values include: debug, info, notice, warn, error, crit,
-   # alert, emerg.
-   LogLevel warn
-
-   CustomLog /var/log/apache2/security.debian.org-access.log privacy
-   ServerSignature On
-</VirtualHost>
-
-# vim: set ts=3 sw=3 et:
diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index dee643826..ac66599f8 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,7 +3,7 @@ class roles::security_mirror {
 	include apache2::cache
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		source => 'puppet:///modules/roles/security_mirror/security.debian.org'
+		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
 	include ferm::ftp_conntrack
diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
new file mode 100644
index 000000000..5299f36aa
--- /dev/null
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -0,0 +1,56 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## 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
+</Directory>
+
+<VirtualHost *:80>
+   ServerAdmin debian-admin@debian.org
+   DocumentRoot /srv/ftp.root/debian-security
+   ServerPath /debian-security
+   ServerName security.debian.org
+   ServerAlias security.ipv6.debian.org
+   ServerAlias security.eu.debian.org
+   ServerAlias security.us.debian.org
+   ServerAlias security.na.debian.org
+   ServerAlias security.geo.debian.org
+   ServerAlias security-cdn.debian.org
+   ServerAlias security-cdn1.debian.org
+   ServerAlias security-cdn2.debian.org
+   ServerAlias security-nagios.debian.org
+
+   ExpiresActive On
+   ExpiresDefault "access plus 2 minutes"
+
+   Alias /debian-security /srv/ftp.root/debian-security
+
+   <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 /srv/ftp.root/debian-security/dists>
+      ExpiresDefault "access plus 1 seconds"
+      Header append Cache-Control "public"
+   </Directory>
+
+   RewriteEngine on
+   RewriteRule ^/$      http://www.debian.org/security/
+
+   # Possible values include: debug, info, notice, warn, error, crit,
+   # alert, emerg.
+   LogLevel warn
+
+   CustomLog /var/log/apache2/security.debian.org-access.log privacy
+   ServerSignature On
+</VirtualHost>
+
+# vim: set ts=3 sw=3 et: