X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9b76aef63b40ade0fa4d8fa4d4a3b6629ab068fc;hb=cb3ab1bb31e1112f69df7db9cdd454aa5d194a32;hp=7cd99394628e3b0d3ea0aaca913df7c1857d4106;hpb=250b44d39b2a25ab5785374b4fcb3c2afa07ad23;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 7cd993946..9b76aef63 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,34 +1,80 @@
 # puppet maintained
 
-<Macro common-static-vhost $name>
-<Macro common-$name>
+<Macro common-static-base $name>
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
 	ServerSignature On
 
-	DocumentRoot /srv/static.debian.org/cur/$name/
-	<Directory /srv/static.debian.org/cur/$name/>
-		AllowOverride FileInfo
-		Options Multiviews Indexes FollowSymLinks
+	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+	<Directory /srv/static.debian.org/mirrors/$name/cur>
+		AllowOverride FileInfo Indexes Options=Multiviews
 		IndexOptions FancyIndexing NameWidth=*
 		Order allow,deny
 		Allow from all
 	</Directory>
 
+	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>
 
-<Virtualhost <%= vhost_listen %> >
-	ServerName $name
-	ServerAdmin debian-admin@lists.debian.org
 
-	ErrorLog /var/log/apache2/$name-error.log
-	CustomLog /var/log/apache2/$name-access.log privacy
+<Macro common-static-vhost-with-extra $name $extra>
+	<Virtualhost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacy
+
+		Use common-static-base $name
+		$extra
+	</VirtualHost>
+</Macro>
+
+<Macro common-static-vhost-publiclog $name>
+	<Virtualhost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacy
+		<IfModule mod_geoip.c>
+			CustomLog /var/log/apache2/$name-public-access.log privacy+geo
+		</IfModule>
+
+		Use common-static-base $name
+	</VirtualHost>
+</Macro>
+
+<Macro common-static-vhost $name>
+	Use common-static-vhost-with-extra $name "# nada"
+</Macro>
+
+
+<Macro common-static-vhost-ssl $name>
+	<VirtualHost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		CustomLog /var/log/apache2/$name-access.log privacy
+		ErrorLog /var/log/apache2/$name-error.log
+
+		Redirect permanent / https://$name/
+	</VirtualHost>
+
+	<Virtualhost <%= vhost_listen_443 %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacy
 
-	Use common-$name
-</VirtualHost>
+		Use common-debian-service-ssl $name
+		Use common-ssl-HSTS
 
+		Use common-static-base $name
+	</VirtualHost>
 </Macro>
 
 # vim:ft=apache: