X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=6b857fc60a474bc2cacccd4d3f276c843bc1cd7d;hb=467db2d533042251de8ef766604fc599a8839679;hp=584b5bcc199047326a9d1b41374b5b394b36ad40;hpb=6c647a0d2c8dc3f9e5c4e70863aae8e3011038ea;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 584b5bcc1..6b857fc60 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/ + + @@ -8,14 +31,19 @@ DocumentRoot /srv/static.debian.org/mirrors/$name/cur - AllowOverride FileInfo - Options Multiviews Indexes FollowSymLinks + AllowOverride FileInfo Indexes Options=Multiviews + Options Indexes SymLinksIfOwnerMatch IndexOptions FancyIndexing NameWidth=* - Order allow,deny - Allow from all + <% if @lsbmajdistrelease > '7' -%> + Require all granted + <% else -%> + Order allow,deny + Allow from all + <% end -%> - DefaultType text/plain + Header set Surrogate-Key <%= hostname %> + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css @@ -33,24 +61,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: