projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ssh-wrapper + userkeys config for buildd rsync uploads
[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
d814211
..
758771c
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,17
+1,22
@@
<Virtualhost <%= vhost_listen %> >
ServerName planet.debian.org
<Virtualhost <%= vhost_listen %> >
ServerName planet.debian.org
- ServerAlias planet.debian.net planeta.debian.net
+ ServerAlias planet.debian.net planeta.debian.net
planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
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
- CustomLog /var/log/apache2/planet.debian.org-access.log
combined
+ CustomLog /var/log/apache2/planet.debian.org-access.log
privacy
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
- DocumentRoot /srv/static.debian.org/
cur/planet.debian.org
+ DocumentRoot /srv/static.debian.org/
mirrors/planet.debian.org/cur
AddDefaultCharset utf-8
AddDefaultCharset utf-8
+ <% if @lsbmajdistrelease > '7' -%>
+ <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+ Require all granted
+ </Directory>
+ <% end -%>
RewriteEngine On
RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
RewriteEngine On
RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]