projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make archvsync_base create the /etc/ssh/userkeys/archvsync symlink
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
apache-www.debian.org.erb
diff --git
a/modules/roles/templates/apache-www.debian.org.erb
b/modules/roles/templates/apache-www.debian.org.erb
index
2988fbe
..
dad8375
100644
(file)
--- a/
modules/roles/templates/apache-www.debian.org.erb
+++ b/
modules/roles/templates/apache-www.debian.org.erb
@@
-142,8
+142,9
@@
ServerAlias newwww.deb.at
DocumentRoot <%= wwwdo_document_root %>/
ServerAlias newwww.deb.at
DocumentRoot <%= wwwdo_document_root %>/
+ LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %V" privacy+host
ErrorLog /var/log/apache2/www-other.debian.org-error.log
ErrorLog /var/log/apache2/www-other.debian.org-error.log
- CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+host
</Macro>
<Macro common-www.d.o>
</Macro>
<Macro common-www.d.o>
@@
-314,6
+315,6
@@
Redirect permanent / https://www.debian.org/
Redirect permanent / https://www.debian.org/
- Use common-debian-service-ssl
www.
debian.org
+ Use common-debian-service-ssl debian.org
Use common-ssl-HSTS
</VirtualHost>
Use common-ssl-HSTS
</VirtualHost>