projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
297a242
)
Remove redundant IndexOptions from all vhosts
author
Peter Palfrader
<peter@palfrader.org>
Thu, 9 Feb 2017 08:44:18 +0000
(09:44 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Thu, 9 Feb 2017 08:44:18 +0000
(09:44 +0100)
modules/apache2/files/puppet-ftp-macros
patch
|
blob
|
history
modules/roles/files/dgit/git.dgit.debian.org
patch
|
blob
|
history
modules/roles/templates/apache-archive.debian.org.erb
patch
|
blob
|
history
modules/roles/templates/apache-ftp.ports.debian.org.erb
patch
|
blob
|
history
modules/roles/templates/static-mirroring/static-vhost.conf.erb
patch
|
blob
|
history
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
patch
|
blob
|
history
modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
patch
|
blob
|
history
diff --git
a/modules/apache2/files/puppet-ftp-macros
b/modules/apache2/files/puppet-ftp-macros
index
73727d7
..
304dc7a
100644
(file)
--- a/
modules/apache2/files/puppet-ftp-macros
+++ b/
modules/apache2/files/puppet-ftp-macros
@@
-3,7
+3,6
@@
<Macro ftp-archive $root>
<Directory $root>
Require all granted
<Macro ftp-archive $root>
<Directory $root>
Require all granted
- IndexOptions NameWidth=*
Options +Indexes +FollowSymLinks
FileETag MTime Size
</Directory>
Options +Indexes +FollowSymLinks
FileETag MTime Size
</Directory>
diff --git
a/modules/roles/files/dgit/git.dgit.debian.org
b/modules/roles/files/dgit/git.dgit.debian.org
index
fd77f19
..
5826517
100644
(file)
--- a/
modules/roles/files/dgit/git.dgit.debian.org
+++ b/
modules/roles/files/dgit/git.dgit.debian.org
@@
-19,7
+19,6
@@
Use common-debian-service-https-redirect * git.dgit.debian.org
<Directory /srv/dgit.debian.org/unpriv/repos>
AllowOverride None
Options SymlinksIfOwnerMatch Indexes
<Directory /srv/dgit.debian.org/unpriv/repos>
AllowOverride None
Options SymlinksIfOwnerMatch Indexes
- IndexOptions FancyIndexing NameWidth=*
</Directory>
SetEnv GIT_PROJECT_ROOT /srv/dgit.debian.org/unpriv/repos
</Directory>
SetEnv GIT_PROJECT_ROOT /srv/dgit.debian.org/unpriv/repos
diff --git
a/modules/roles/templates/apache-archive.debian.org.erb
b/modules/roles/templates/apache-archive.debian.org.erb
index
21bd9aa
..
e405bb3
100644
(file)
--- a/
modules/roles/templates/apache-archive.debian.org.erb
+++ b/
modules/roles/templates/apache-archive.debian.org.erb
@@
-19,7
+19,6
@@
<Directory <%= archive_root %>>
Require all granted
<Directory <%= archive_root %>>
Require all granted
- IndexOptions NameWidth=*
Options +Indexes +FollowSymLinks
</Directory>
Options +Indexes +FollowSymLinks
</Directory>
diff --git
a/modules/roles/templates/apache-ftp.ports.debian.org.erb
b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index
d7cd67f
..
458a83e
100644
(file)
--- a/
modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/
modules/roles/templates/apache-ftp.ports.debian.org.erb
@@
-21,7
+21,6
@@
Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
<Directory /srv/mirrors/debian-ports-cd>
Require all granted
Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
<Directory /srv/mirrors/debian-ports-cd>
Require all granted
- IndexOptions NameWidth=*
Options +Indexes
Options +FollowSymLinks
</Directory>
Options +Indexes
Options +FollowSymLinks
</Directory>
diff --git
a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index
89f6c3e
..
5b2eb4d
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-24,7
+24,6
@@
<Directory /srv/static.debian.org/mirrors/$name/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
<Directory /srv/static.debian.org/mirrors/$name/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
- IndexOptions FancyIndexing NameWidth=*
Require all granted
</Directory>
Require all granted
</Directory>
diff --git
a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index
0749d36
..
48b1d80
100644
(file)
--- a/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@
-32,7
+32,6
@@
<Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
<Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
- IndexOptions FancyIndexing NameWidth=*
Require all granted
</Directory>
Require all granted
</Directory>
@@
-82,7
+81,6
@@
<Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
Require all granted
Options Indexes SymLinksIfOwnerMatch MultiViews
<Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
Require all granted
Options Indexes SymLinksIfOwnerMatch MultiViews
- IndexOptions FancyIndexing NameWidth=*
AddEncoding gzip .gz
FilterDeclare gzip CONTENT_SET
AddEncoding gzip .gz
FilterDeclare gzip CONTENT_SET
@@
-103,7
+101,6
@@
<Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Multiviews Indexes FollowSymLinks Includes
<Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
AllowOverride FileInfo Indexes Options=Multiviews
Options Multiviews Indexes FollowSymLinks Includes
- IndexOptions FancyIndexing NameWidth=*
Require all granted
</Directory>
Require all granted
</Directory>
diff --git
a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index
5e4588b
..
b1a9538
100644
(file)
--- a/
modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/
modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@
-32,7
+32,6
@@
lines = []
lines << " Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"
lines << " <Directory /srv/mirrors/#{archive}/project/trace/>"
lines << " Require all granted"
lines << " Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"
lines << " <Directory /srv/mirrors/#{archive}/project/trace/>"
lines << " Require all granted"
- lines << " IndexOptions NameWidth=*"
lines << " Options +Indexes"
lines << " </Directory>"
end
lines << " Options +Indexes"
lines << " </Directory>"
end