X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fanonscm%2Fanonscm.debian.org.conf.erb;h=ca667dc95e93e497b5da5bb14edce9a5a59e4911;hb=6510538f5a1a525e62e85be0d887c1f1b3e0e3fd;hp=a5fbc8d7d5bb9d78955881b9b17b1887ee17484d;hpb=b93b11ac11a497249640867525733ffadc6a278d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb b/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
index a5fbc8d7d..ca667dc95 100644
--- a/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
+++ b/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
@@ -5,13 +5,20 @@
 
 <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>
 
+	RewriteEngine on
+	Use anonscm.debian.org-anonscm-map
 </Macro>
 
 <VirtualHost *:443>
@@ -22,12 +29,8 @@
 	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
-	#Use common-ssl-HSTS
-	#Use http-pkp-anonscm.debian.org
 </VirtualHost>
 
 # vim:set syn=apache: