X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=b2650744f6c2bb5f8aa65fb3124f4c3ff07910ae;hb=0fe7624b0c747dda85c88b7de4ab857c0a2d6798;hp=e3aceae7bef443d895c06523cbaae92808417e06;hpb=d16ec737ef548a5ee85277ea8a95c3907ce99548;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 e3aceae7b..b2650744f 100644 --- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb +++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb @@ -1,4 +1,27 @@ # puppet maintained + + > + 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/ + + + + + > + ServerName $name + ServerAdmin debian-admin@lists.debian.org + + CustomLog /var/log/apache2/$name-access.log privacy + ErrorLog /var/log/apache2/$name-error.log + + Redirect / https://$name/ + + @@ -9,12 +32,13 @@ DocumentRoot /srv/static.debian.org/mirrors/$name/cur AllowOverride FileInfo Indexes Options=Multiviews - Options Multiviews Indexes FollowSymLinks IndexOptions FancyIndexing NameWidth=* Order allow,deny Allow from all + Header set Surrogate-Key <%= hostname %> + DefaultType text/plain AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css @@ -33,24 +57,26 @@ - - > + + Use common-static-vhost-with-extra $name "# nada" + + + + + Use common-dsa-vhost-https-redirect $name + + > ServerName $name ServerAdmin debian-admin@lists.debian.org ErrorLog /var/log/apache2/$name-error.log - CustomLog /var/log/apache2/$name-access.log privacy - - CustomLog /var/log/apache2/$name-public-access.log privacy+geo - + CustomLog /var/log/apache2/$name-access.log privacyssl + + Use common-debian-service-ssl $name + Use common-ssl-HSTS Use common-static-base $name - - Use common-static-vhost-with-extra $name "# nada" - - - # vim:ft=apache: