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=e143e95a9bd27ba77fb02aa8e02e665a0ada6382;hp=c6e8e4321e60ae3c6fa5846533166aab5caceca5;hpb=44ad2d6e55003cf4959742350495072327cb108e;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 c6e8e4321..ca667dc95 100644
--- a/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
+++ b/modules/roles/templates/anonscm/anonscm.debian.org.conf.erb
@@ -5,12 +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>
+
+	RewriteEngine on
 	Use anonscm.debian.org-anonscm-map
 </Macro>
 
@@ -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: