Add lw08 to the snapshot_shell role and give ftp-master some infra there

[mirror/dsa-puppet.git] / modules / roles / templates / snapshot / snapshot.debian.org.conf.erb

diff --git a/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb b/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
index e3d4c31..2b4e9b8 100644 (file)
--- a/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
+++ b/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
@@ -4,7 +4,7 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
 
 <VirtualHost *:80>
   ServerName snapshot.debian.org
-  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org snapshot.debian.net
+  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org
   ServerAdmin team@snapshot.debian.org
 
   ErrorLog  /var/log/apache2/snapshot.debian.org-error.log
@@ -25,9 +25,6 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
   RewriteRule ^/archive/backports.org/(.*) /archive/debian-backports/$1 [L,R]
   RewriteRule ^/git/(.*) /gits/snapshot.git/$1 [PT]
 
-  RewriteCond  %{HTTP_HOST} ^snapshot.debian.net$
-  RewriteRule ^/(.*)$ http://snapshot.debian.org/ [R]
-
   <Location /gits/>
     Require all granted
   </Location>
@@ -42,6 +39,20 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
 
   WSGIScriptAlias / /srv/snapshot.debian.org/bin/snapshot.wsgi
   WSGIProcessGroup snapshot.debian.org
+
+  <IfModule mod_qos.c>
+    QS_LocRequestLimitDefault  30
+  </IfModule>
+</VirtualHost>
+
+<VirtualHost *:80>
+  ServerName snapshot.debian.net
+  ServerAdmin team@snapshot.debian.org
+
+  ErrorLog  /var/log/apache2/snapshot.debian.net-error.log
+  CustomLog /var/log/apache2/snapshot.debian.net-access.log combined
+
+  RewriteRule ^/(.*)$ http://snapshot.debian.org/ [R]
 </VirtualHost>
 
 <VirtualHost *:80>