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 %>
</Macro>
-<Macro common-static-vhost-with-extra $name $extra>
+
+
+<Macro common-static-vhost-with-extra $name $onion>
<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
- $extra
+ Use vhost-$name-extra
</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 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-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: