vhost update

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

diff --git a/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb b/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
index a5fbc8d..a4e92c7 100644 (file)
--- a/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
+++ b/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
@@ -5,13 +5,19 @@
 
 <Macro vhost-inner-anonscm.debian.org>
        ServerName anonscm.debian.org
-       ServerAlias git.debian.ogr
+       ServerAlias git.debian.org
        ServerAdmin debian-admin@lists.debian.org
 
        ErrorLog /var/log/apache2/anonscm.debian.org-error.log
        CustomLog /var/log/apache2/anonscm.debian.org-access.log privacy
 
+       DocumentRoot /srv/anonscm.debian.org/htdocs
+       <Directory /srv/anonscm.debian.org/htdocs>
+               Require all granted
+               AllowOverride None
+       </Directory>
 
+       Use anonscm.debian.org-anonscm-map
 </Macro>
 
 <VirtualHost *:443>
@@ -22,7 +28,7 @@
        Use http-pkp-anonscm.debian.org
 </VirtualHost>
 
-<VirtualHost *:443>
+<VirtualHost *:80>
        Use vhost-inner-anonscm.debian.org
 
        #Use common-debian-service-ssl anonscm.debian.org