projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change pin thing
[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
e041357
..
2610811
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-11,19
+11,10
@@
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
-<Macro common-dsa-vhost-https-redirect-temp $name>
- <VirtualHost <%= vhost_listen %> >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
-
- CustomLog /var/log/apache2/$name-access.log privacy
- ErrorLog /var/log/apache2/$name-error.log
+<Macro prepare-static-vhost $name>
+<Macro static-vhost-base-$name>
+ ServerAdmin debian-admin@lists.debian.org
- Redirect / https://$name/
- </VirtualHost>
-</Macro>
-
-<Macro common-static-base $name>
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
@@
-40,38
+31,35
@@
Header set Surrogate-Key <%= hostname %>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
Header set Surrogate-Key <%= hostname %>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-</Macro>
+ Use vstatic-vhost-extra-$name
+</Macro>
-<Macro
common-static-vhost-with-extra
$name>
- <Virtual
host <%= vhost_listen %>
>
+<Macro
static-vhost-plain-
$name>
+ <Virtual
Host <%= vhost_listen %>
>
ServerName $name
ServerName $name
- ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacy
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacy
- Use common-static-base $name
- Use vhost-$name-extra
+ Use static-vhost-base-$name
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
-<Macro common-static-vhost $name>
- <Macro vhost-$name-extra>
- # mod macro does not like empty macros, so here's some content:
- <Directory /non-existant>
- </Directory>
- </Macro>
- Use common-static-vhost-with-extra $name
-</Macro>
+<Macro static-vhost-onion-$name $onion>
+ <VirtualHost <%= vhost_listen %>>
+ ServerName $onion
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacy
-<Macro common-static-vhost-ssl $name>
- Use common-dsa-vhost-https-redirect $name
+ Use static-vhost-base-$name
+ </VirtualHost>
+</Macro>
- <Virtualhost <%= vhost_listen_443 %> >
+<Macro static-vhost-ssl-$name>
+ <VirtualHost <%= vhost_listen_443 %>>
ServerName $name
ServerName $name
- ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacyssl
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacyssl
@@
-79,8
+67,9
@@
Use common-debian-service-ssl $name
Use common-ssl-HSTS
Use common-debian-service-ssl $name
Use common-ssl-HSTS
- Use
common-static-base
$name
+ Use
static-vhost-base-
$name
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
+</Macro>
# vim:ft=apache:
# vim:ft=apache: