Allow gid videoteam to sudo to local user veyepar on vittoria

[dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 566947364ad82650c22cf19a59f81b8292fa889a..b83d602c28c54088d7ba8cd5fc5044bb93f4035b 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -119,6 +119,9 @@
    ServerAlias www.debian.eu
    ServerAlias debian.eu
 
+   ServerAlias www.debian.fi
+   ServerAlias debian.fi
+
    ServerAlias www.debian.com
    ServerAlias debian.com
 
@@ -238,6 +241,7 @@
    RedirectPermanent /releases/9 /releases/stretch
    RedirectPermanent /releases/10 /releases/buster
    RedirectPermanent /releases/unstable /releases/sid
+   RedirectPermanent /support/ /support
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
    RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -282,14 +286,12 @@
 <VirtualHost <%= vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
-   CustomLog /var/log/apache2/www.debian.org-public-access.log privacy
 
    Use common-www.d.o
 </VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
-   CustomLog /var/log/apache2/www.debian.org-public-access.log privacyssl
 
    Use common-www.d.o