projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add template
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
static-mirroring
/
static-vhost.conf.erb
diff --git
a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index
6c7ad11
..
6b857fc
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-66,7
+66,7
@@
</Macro>
</Macro>
-<Macro common-static-vhost-ssl
-with-extra $name $extra
>
+<Macro common-static-vhost-ssl
$name
>
Use common-dsa-vhost-https-redirect $name
<Virtualhost <%= vhost_listen_443 %> >
Use common-dsa-vhost-https-redirect $name
<Virtualhost <%= vhost_listen_443 %> >
@@
-80,12
+80,7
@@
Use common-ssl-HSTS
Use common-static-base $name
Use common-ssl-HSTS
Use common-static-base $name
- $extra
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
-<Macro common-static-vhost-ssl $name>
- Use common-static-vhost-ssl-with-extra $name "# nada"
-</Macro>
-
# vim:ft=apache:
# vim:ft=apache: