X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=58cfb1d88444703844d9e6373954eac05565284e;hb=bf16c9dd36884ae478a783b14bc51b2fe26fcb08;hp=5e3fe41db0fd37ec18383cd078bec745597ab7ae;hpb=81e8b5f7499e90bb8cb59f09518ed7cae95660aa;p=dsa-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 5e3fe41d..58cfb1d8 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,4 +1,15 @@
# 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/
+
+
@@ -38,15 +49,7 @@
- >
- 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/
-
+ Use common-dsa-vhost-https-redirect $name
>
ServerName $name