move lintian to standard static setup

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index fea09d6..53b7b8a 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -63,8 +63,7 @@ class roles::static_mirror {
 
        apache2::site { '010-lintian.debian.org':
                site    => 'lintian.debian.org',
-               ensure  => has_static_component('lintian.debian.org') ? { true => "present", false => "absent" },
-               content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
+               ensure  => absent,
        }
 
        apache2::site { '010-static-vhosts-simple':

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
deleted file mode 100644 (file)
index 89a74d0..0000000
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ /dev/null
@@ -1,71 +0,0 @@
-<% if scope.function_has_static_component(['lintian.debian.org']) -%>
-
-Use common-dsa-vhost-https-redirect lintian.debian.org
-
-<Macro vhost-inner-lintian.debian.org>
-       ServerAdmin lintian-maint@debian.org
-
-       ErrorLog /var/log/apache2/lintian.debian.org-error.log
-       CustomLog /var/log/apache2/lintian.debian.org-access.log privacyssl
-
-       <IfModule mod_userdir.c>
-               UserDir disabled
-       </IfModule>
-
-       DocumentRoot /srv/static.debian.org/mirrors/lintian.debian.org/cur
-       AddDefaultCharset utf-8
-
-       <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-               Require all granted
-
-               # These three lines makes apache serve
-               # "lintian.log.gz" as a text/plain with encoding gzip
-               # making it easier to view the log in the browser.
-               RemoveType .gz
-               AddEncoding x-gzip .gz
-               AddType text/plain .log
-
-               <IfModule mod_userdir.c>
-                       AddOutputFilterByType DEFLATE image/svg+xml
-                       AddOutputFilterByType DEFLATE text/plain
-               </IfModule>
-       </Directory>
-
-       <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
-               # Cache these for a year (3600 * 24 * 365.25)
-               # Files in here will change name if their content change
-               Header set Cache-Control "max-age=31557600, public"
-       </Directory>
-
-       RewriteEngine on
-       RewriteMap source-map txt:/srv/static.debian.org/mirrors/lintian.debian.org/cur/lookup-tables/source-packages
-
-       # Re-direct from the "old" locations to the new ones
-       RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L,R=permanent]
-       RewriteRule ^/reports/(.*)$ /$1 [L,R=permanent]
-
-       # Map source packages to reports (this mapping is re-written once per lintian run,
-       # serve it as a 302 rather than a permanent redirect)
-       # Version-less request
-       RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE]
-       # Versioned request
-       RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
-</Macro>
-
-<Virtualhost <%= vhost_listen_443 %> >
-       ServerName lintian.debian.org
-       Use common-debian-service-ssl lintian.debian.org
-       Use common-ssl-HSTS
-
-       Use vhost-inner-lintian.debian.org
-</VirtualHost>
-
-<% if scope.function_onion_global_service_hostname(['lintian.debian.org']) -%>
-<Virtualhost <%= vhost_listen %> >
-       ServerName <%= scope.function_onion_global_service_hostname(['lintian.debian.org']) %>
-       Use vhost-inner-lintian.debian.org
-</VirtualHost>
-<% end %>
-<% end -%>
-
-# vim:set syn=apache:

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index e917765..184668b 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -63,6 +63,48 @@
 
        AddOutputFilter INCLUDES .xhtml
 </Macro>
+
+
+<Macro vstatic-vhost-extra-lintian.debian.org>
+       AddDefaultCharset utf-8
+
+       <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
+               Require all granted
+
+               # These three lines makes apache serve
+               # "lintian.log.gz" as a text/plain with encoding gzip
+               # making it easier to view the log in the browser.
+               RemoveType .gz
+               AddEncoding x-gzip .gz
+               AddType text/plain .log
+
+               <IfModule mod_userdir.c>
+                       AddOutputFilterByType DEFLATE image/svg+xml
+                       AddOutputFilterByType DEFLATE text/plain
+               </IfModule>
+       </Directory>
+
+       <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
+               # Cache these for a year (3600 * 24 * 365.25)
+               # Files in here will change name if their content change
+               Header set Cache-Control "max-age=31557600, public"
+       </Directory>
+
+       RewriteEngine on
+       RewriteMap source-map txt:/srv/static.debian.org/mirrors/lintian.debian.org/cur/lookup-tables/source-packages
+
+       # Re-direct from the "old" locations to the new ones
+       RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L,R=permanent]
+       RewriteRule ^/reports/(.*)$ /$1 [L,R=permanent]
+
+       # Map source packages to reports (this mapping is re-written once per lintian run,
+       # serve it as a 302 rather than a permanent redirect)
+       # Version-less request
+       RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE]
+       # Versioned request
+       RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -130,6 +172,7 @@ vhost(lines, "miniconf10.debconf.org" , :ssl => true)
 vhost(lines, "deb.debian.org", :extra => true)
 vhost(lines, "release.debian.org", :ssl => true, :extra => true)
 vhost(lines, "www.ports.debian.org", :ssl => true, :extra => true)
+vhost(lines, "lintian.debian.org", :ssl => true, :extra => true)
 
 lines.join("\n")
 -%>