projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also redirect URLs that are missing a trailing slash
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
static-mirroring
/
vhost
/
planet.debian.org.erb
diff --git
a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
index
20f9298
..
9dca69c
100644
(file)
--- a/
modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/
modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@
-1,8
+1,11
@@
<% if scope.function_has_static_component(['planet.debian.org']) -%>
<% if scope.function_has_static_component(['planet.debian.org']) -%>
-<Virtualhost <%= vhost_listen %> >
+<Virtualhost <%=
@
vhost_listen %> >
ServerName planet.debian.org
ServerAlias planet.debian.net planeta.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
ServerName planet.debian.org
ServerAlias planet.debian.net planeta.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
+ <% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %>
+ <% end %>
ServerAdmin planet@debian.org
ErrorLog /var/log/apache2/planet.debian.org-error.log
ServerAdmin planet@debian.org
ErrorLog /var/log/apache2/planet.debian.org-error.log
@@
-14,11
+17,9
@@
DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
AddDefaultCharset utf-8
DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
AddDefaultCharset utf-8
- <% if @lsbmajdistrelease > '7' -%>
- <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
- Require all granted
- </Directory>
- <% end -%>
+ <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+ Require all granted
+ </Directory>
RewriteEngine On
RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
RewriteEngine On
RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]