From bc12cd8473771b6feb8de7d688a783b519311d44 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 26 Apr 2013 11:27:17 +0200 Subject: [PATCH] Make the www.d.o apache config a template --- modules/roles/manifests/www_mirror.pp | 3 +++ .../apache-www.debian.org.erb} | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) rename modules/roles/{files/www_mirror/www.debian.org => templates/apache-www.debian.org.erb} (97%) diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp index a5d925f8a..59564f425 100644 --- a/modules/roles/manifests/www_mirror.pp +++ b/modules/roles/manifests/www_mirror.pp @@ -1,7 +1,10 @@ class roles::www_mirror { + $wwwdo_document_root = '/srv/www.debian.org/www' + apache2::site { '010-www.debian.org': site => 'www.debian.org', source => 'puppet:///modules/roles/www_mirror/www.debian.org', + content => template('roles/apache-www.debian.org.erb'), } } diff --git a/modules/roles/files/www_mirror/www.debian.org b/modules/roles/templates/apache-www.debian.org.erb similarity index 97% rename from modules/roles/files/www_mirror/www.debian.org rename to modules/roles/templates/apache-www.debian.org.erb index 9f6ace83a..7073f96d5 100644 --- a/modules/roles/files/www_mirror/www.debian.org +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -4,7 +4,7 @@ ## # Need to turn on negotiation_module - +/> Options +MultiViews +FollowSymLinks +Indexes AddHandler type-map var # Make sure that the srm.conf directive is commented out. @@ -90,7 +90,7 @@ ServerName www.nl.debian.org ServerAdmin webmaster@debian.org ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com - DocumentRoot /srv/www.debian.org/www/ + DocumentRoot <%= wwwdo_document_root %>/ ErrorLog /var/log/apache2/www-other.debian.org-error.log CustomLog /var/log/apache2/www-other.debian.org-access.log privacy RewriteLog /var/log/apache2/www-other.debian.org-redirect.log @@ -104,7 +104,7 @@ ServerName www.debian.org ServerAdmin webmaster@debian.org ServerAlias www-*.debian.org - DocumentRoot /srv/www.debian.org/www/ + DocumentRoot <%= wwwdo_document_root %>/ ErrorLog /var/log/apache2/www.debian.org-error.log CustomLog /var/log/apache2/www.debian.org-access.log privacy @@ -189,12 +189,12 @@ RewriteRule ^/devel/debian-volatile/.* /volatile/ [R=301] # Offer a Redirect to DSA without knowing year #474730 - RewriteMap dsa txt:/srv/www.debian.org/www/security/map-dsa.txt + RewriteMap dsa txt:<%= wwwdo_document_root %>/security/map-dsa.txt RewriteRule ^/security/dsa-(\d+)(\..*)? /security/${dsa:$1}$2 [R=301] # Compatibility after SGML -> DocBook # Debian Reference #624239 - RewriteMap reference txt:/srv/www.debian.org/www/doc/map-reference.txt + RewriteMap reference txt:<%= wwwdo_document_root %>/doc/map-reference.txt RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/ch-support$1 !-f RewriteRule ^/doc/manuals/debian-reference/ch-support(.*) /support$1 [L,R=301] RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/${reference:$1}$2 -f -- 2.20.1