projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch db.d.o to letsencrypt
[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
195be9f
..
2988fbe
100644
(file)
--- a/
modules/roles/templates/apache-www.debian.org.erb
+++ b/
modules/roles/templates/apache-www.debian.org.erb
@@
-91,10
+91,6
@@
ServerName debian.org
ServerAdmin webmaster@debian.org
ServerName debian.org
ServerAdmin webmaster@debian.org
- <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
- ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
- <% end %>
-
ServerAlias www.at.debian.org
ServerAlias www.au.debian.org
ServerAlias www.bg.debian.org
ServerAlias www.at.debian.org
ServerAlias www.au.debian.org
ServerAlias www.bg.debian.org
@@
-154,6
+150,10
@@
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
+ <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+ <% end %>
+
DocumentRoot <%= wwwdo_document_root %>/
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
DocumentRoot <%= wwwdo_document_root %>/
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each