add dyn.manpages role and vhost

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c9e716d..835f156 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -64,8 +64,8 @@ class roles {
                }
        }
 
-       if has_role('manpages') {
-               ssl::service { 'dyn.manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+       if has_role('manpages-dyn') {
+               include roles::manpages_dyn
        }
 
        if has_role('security_mirror') {

diff --git a/modules/roles/manifests/manpages_dyn.pp b/modules/roles/manifests/manpages_dyn.pp
new file mode 100644 (file)
index 0000000..706a672
--- /dev/null
+++ b/modules/roles/manifests/manpages_dyn.pp
@@ -0,0 +1,8 @@
+class roles::manpages_dyn {
+       ssl::service { 'dyn.manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+
+       apache2::site { 'dyn.manpages.debian.org':
+               site   => 'dyn.manpages.debian.org',
+               content => template('roles/manpages/dyn.manpages.debian.org.erb')
+       }
+}

diff --git a/modules/roles/templates/manpages/dyn.manpages.debian.org.erb b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
new file mode 100644 (file)
index 0000000..ea9237c
--- /dev/null
+++ b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
@@ -0,0 +1,32 @@
+Use common-debian-service-https-redirect * dyn.manpages.debian.org
+
+<VirtualHost *:443>
+       ServerName dyn.manpages.debian.org
+       ServerAdmin debian-admin@lists.debian.org
+
+       Use common-debian-service-ssl dyn.manpages.debian.org
+       Use common-ssl-HSTS
+       Use http-pkp-dyn.manpages.debian.org
+
+       ErrorLog /var/log/apache2/dyn.manpages.debian.org-error.log
+       CustomLog /var/log/apache2/dyn.manpages.debian.org-access.log privacy
+
+       # URLs which end in a slash do not need to be rewritten
+       RewriteEngine on
+       RewriteRule ^(.*/)$ "https://manpages.debian.org$1" [R=307,L]
+
+       # Redirect fully qualified URLs to the correct host.
+       RewriteCond "/srv/manpages.debian.org/www/%{REQUEST_FILENAME}" "-f" [OR]
+       RewriteCond "/srv/manpages.debian.org/www/%{REQUEST_FILENAME}.gz" "-f"
+       RewriteRule "^/(.*)" "https://manpages.debian.org/$1" [R=307,L]
+
+       # Use the correct host in redirects
+       Header edit Location "^/" "https://manpages.debian.org/"
+
+       <Location />
+               ProxyPass "http://localhost:2431/"
+               ProxyPassReverse "http://localhost:2431/"
+       </Location>
+</VirtualHost>
+
+# vim:set syn=apache: