Import popcon.d.o apache vhost config

diff --git a/modules/roles/files/popcon/popcon.debian.org.conf b/modules/roles/files/popcon/popcon.debian.org.conf
new file mode 100644 (file)
index 0000000..c589861
--- /dev/null
+++ b/modules/roles/files/popcon/popcon.debian.org.conf
@@ -0,0 +1,71 @@
+<VirtualHost *:80>
+       ServerName popcon.debian.org
+       ServerAlias popcon2.debian.org
+       ServerAdmin popcon-developers@lists.alioth.debian.org
+
+       ErrorLog /var/log/apache2/popcon.debian.org-error.log
+       CustomLog /var/log/apache2/popcon.debian.org-access.log privacy
+
+       DocumentRoot /srv/popcon.debian.org/www
+       <Directory /srv/popcon.debian.org/www>
+               Require all granted
+       </Directory>
+
+       AddDefaultCharset utf-8
+       ScriptAlias /cgi-bin /srv/popcon.debian.org/cgi-bin/
+       <Directory /srv/popcon.debian.org/cgi-bin>
+               Require all granted
+       </Directory>
+
+       RewriteEngine on
+       RewriteRule ^/src:([-a-z+.0-9]+)$ https://qa.debian.org/developer.php?popcon=$1 [R,L]
+
+       RewriteCond "%{HTTP_USER_AGENT}" !popcon-upload
+       RewriteRule ^(.*) https://popcon.debian.org$1 [R,L]
+
+       #UserDir public_popcon
+       #<IfModule mod_deflate.c>
+       #   AddOutputFilterByType DEFLATE text/html text/xml
+       #</IfModule>
+
+       #<IfModule mod_fcgid.c>
+       #       <Directory /home/*/public_popcon>
+       #               Options +MultiViews
+       #
+       #               AddHandler fcgid-script .php
+       #               FCGIWrapper /usr/lib/cgi-bin/php5 .php
+       #               <Files *.php>
+       #                       Options ExecCGI
+       #               </Files>
+       #       </Directory>
+       #</IfModule>
+</VirtualHost>
+
+<VirtualHost *:443>
+       ServerName popcon.debian.org
+       ServerAlias popcon2.debian.org
+       ServerAdmin popcon-developers@lists.alioth.debian.org
+
+       Use common-debian-service-ssl popcon.debian.org
+#      Use common-ssl-HSTS
+       Use http-pkp-popcon.debian.org
+
+       ErrorLog /var/log/apache2/popcon.debian.org-error.log
+       CustomLog /var/log/apache2/popcon.debian.org-access.log privacyssl
+
+       DocumentRoot /srv/popcon.debian.org/www
+       <Directory /srv/popcon.debian.org/www>
+               Require all granted
+       </Directory>
+
+       AddDefaultCharset utf-8
+       ScriptAlias /cgi-bin /srv/popcon.debian.org/cgi-bin/
+       <Directory /srv/popcon.debian.org/cgi-bin>
+               Require all granted
+       </Directory>
+
+       RewriteEngine on
+       RewriteRule ^/src:([-a-z+.0-9]+)$ https://qa.debian.org/developer.php?popcon=$1 [R,L]
+</VirtualHost>
+
+# vim:set syn=apache:

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b8507f3..6b447f9 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -355,6 +355,6 @@ class roles {
        }
 
        if has_role('popcon') {
-               ssl::service { 'popcon.debian.org': notify => Exec['service apache2 reload'], key => true, }
+               include roles::popcon
        }
 }

diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp
new file mode 100644 (file)
index 0000000..080c8d5
--- /dev/null
+++ b/modules/roles/manifests/popcon.pp
@@ -0,0 +1,12 @@
+class roles::popcon {
+       ssl::service { 'popcon.debian.org':
+               notify  => Exec['service apache2 reload'],
+               key => true,
+       }
+
+       include apache2::ssl
+       apache2::site { 'popcon.debian.org':
+               site => 'popcon.debian.org',
+               source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
+       }
+}