projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also print cutoff times
[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
5b2eb4d
..
9a3e83c
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-1,6
+1,6
@@
# puppet maintained
<Macro common-dsa-vhost-https-redirect $name>
# puppet maintained
<Macro common-dsa-vhost-https-redirect $name>
- <VirtualHost <%= vhost_listen %> >
+ <VirtualHost <%=
@
vhost_listen %> >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@
-27,7
+27,7
@@
Require all granted
</Directory>
Require all granted
</Directory>
- Header set Surrogate-Key <%= hostname %>
+ Header set Surrogate-Key <%=
@
hostname %>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@
-35,7
+35,7
@@
</Macro>
<Macro static-vhost-plain-$name>
</Macro>
<Macro static-vhost-plain-$name>
- <VirtualHost <%= vhost_listen %>>
+ <VirtualHost <%=
@
vhost_listen %>>
ServerName $name
ErrorLog /var/log/apache2/$name-error.log
ServerName $name
ErrorLog /var/log/apache2/$name-error.log
@@
-46,7
+46,7
@@
</Macro>
<Macro static-vhost-onion-$name $onion>
</Macro>
<Macro static-vhost-onion-$name $onion>
- <VirtualHost <%= vhost_listen %>>
+ <VirtualHost <%=
@
vhost_listen %>>
ServerName $onion
ErrorLog /var/log/apache2/$name-error.log
ServerName $onion
ErrorLog /var/log/apache2/$name-error.log
@@
-57,7
+57,7
@@
</Macro>
<Macro static-vhost-ssl-$name>
</Macro>
<Macro static-vhost-ssl-$name>
- <VirtualHost <%= vhost_listen_443 %>>
+ <VirtualHost <%=
@
vhost_listen_443 %>>
ServerName $name
ErrorLog /var/log/apache2/$name-error.log
ServerName $name
ErrorLog /var/log/apache2/$name-error.log