projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
onions for standard static vhosts
[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
6b857fc
..
c2d2252
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-34,12
+34,7
@@
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
IndexOptions FancyIndexing NameWidth=*
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
IndexOptions FancyIndexing NameWidth=*
- <% if @lsbmajdistrelease > '7' -%>
- Require all granted
- <% else -%>
- Order allow,deny
- Allow from all
- <% end -%>
+ Require all granted
</Directory>
Header set Surrogate-Key <%= hostname %>
</Directory>
Header set Surrogate-Key <%= hostname %>
@@
-48,25
+43,33
@@
</Macro>
</Macro>
-<Macro common-static-vhost-with-extra $name $extra>
+
+
+<Macro common-static-vhost-with-extra $name $onion>
<Virtualhost <%= vhost_listen %> >
ServerName $name
<Virtualhost <%= vhost_listen %> >
ServerName $name
+ ServerAlias $onion
ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
-
$
extra
+
Use vhost-$name-
extra
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
-<Macro common-static-vhost $name>
- Use common-static-vhost-with-extra $name "# nada"
+<Macro common-static-vhost $name $onion>
+ <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 $onion
</Macro>
</Macro>
-<Macro common-static-vhost-ssl $name>
+<Macro common-static-vhost-ssl $name
$onion
>
Use common-dsa-vhost-https-redirect $name
<Virtualhost <%= vhost_listen_443 %> >
Use common-dsa-vhost-https-redirect $name
<Virtualhost <%= vhost_listen_443 %> >
@@
-81,6
+84,16
@@
Use common-static-base $name
</VirtualHost>
Use common-static-base $name
</VirtualHost>
+
+ <Virtualhost <%= vhost_listen %> >
+ ServerName $onion
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacyssl
+
+ Use common-static-base $name
+ </VirtualHost>
</Macro>
# vim:ft=apache:
</Macro>
# vim:ft=apache: