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:
6b838d7
)
merge directory setup into ftp-archive macro
author
Peter Palfrader
<peter@palfrader.org>
Mon, 30 Jan 2017 18:08:11 +0000
(19:08 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 30 Jan 2017 18:08:14 +0000
(19:08 +0100)
modules/apache2/files/puppet-ftp-macros
patch
|
blob
|
history
modules/roles/templates/apache-debug.mirrors.debian.org.erb
patch
|
blob
|
history
modules/roles/templates/apache-ftp.ports.debian.org.erb
patch
|
blob
|
history
modules/roles/templates/security_mirror/security.debian.org.erb
patch
|
blob
|
history
diff --git
a/modules/apache2/files/puppet-ftp-macros
b/modules/apache2/files/puppet-ftp-macros
index
e3c9a55
..
2796fec
100644
(file)
--- a/
modules/apache2/files/puppet-ftp-macros
+++ b/
modules/apache2/files/puppet-ftp-macros
@@
-1,6
+1,12
@@
<IfModule mod_headers.c>
<IfModule mod_macro.c>
<Macro ftp-archive $root>
<IfModule mod_headers.c>
<IfModule mod_macro.c>
<Macro ftp-archive $root>
+ <Directory $root>
+ Require all granted
+ IndexOptions NameWidth=* +SuppressDescription
+ Options +Indexes +FollowSymLinks
+ FileETag MTime Size
+ </Directory>
<Directory $root/pool>
<Files ?*>
Header set Cache-Control "public, max-age=2592000"
<Directory $root/pool>
<Files ?*>
Header set Cache-Control "public, max-age=2592000"
@@
-19,3
+25,4
@@
</Macro>
</IfModule>
</IfModule>
</Macro>
</IfModule>
</IfModule>
+# vim:set syn=apache:
diff --git
a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index
5d2ac23
..
6f913b1
100644
(file)
--- a/
modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/
modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@
-17,11
+17,6
@@
LogLevel warn
CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
LogLevel warn
CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
- <Directory /srv/mirrors/debian-debug>
- Require all granted
- IndexOptions NameWidth=* +SuppressDescription
- Options +Indexes
- Options +FollowSymLinks
- </Directory>
Use ftp-archive /srv/mirrors/debian-debug
</VirtualHost>
Use ftp-archive /srv/mirrors/debian-debug
</VirtualHost>
+# vim:set syn=apache:
diff --git
a/modules/roles/templates/apache-ftp.ports.debian.org.erb
b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index
5a060ce
..
9aa05af
100644
(file)
--- a/
modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/
modules/roles/templates/apache-ftp.ports.debian.org.erb
@@
-17,12
+17,6
@@
RedirectMatch "^/$" /debian-ports/
Alias /debian-ports /srv/mirrors/debian-ports
RedirectMatch "^/$" /debian-ports/
Alias /debian-ports /srv/mirrors/debian-ports
- <Directory /srv/mirrors/debian-ports>
- Require all granted
- IndexOptions NameWidth=* +SuppressDescription
- Options +Indexes
- Options +FollowSymLinks
- </Directory>
Use ftp-archive /srv/mirrors/debian-ports
Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
Use ftp-archive /srv/mirrors/debian-ports
Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
@@
-33,3
+27,4
@@
Options +FollowSymLinks
</Directory>
</VirtualHost>
Options +FollowSymLinks
</Directory>
</VirtualHost>
+# vim:set syn=apache:
diff --git
a/modules/roles/templates/security_mirror/security.debian.org.erb
b/modules/roles/templates/security_mirror/security.debian.org.erb
index
dc96ff2
..
d4fbe9d
100644
(file)
--- a/
modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/
modules/roles/templates/security_mirror/security.debian.org.erb
@@
-3,14
+3,6
@@
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
-<Directory /srv/ftp.root/debian-security>
- IndexOptions NameWidth=* +SuppressDescription
- Options +FollowSymLinks
- Options +Indexes
- FileETag MTime Size
- Require all granted
-</Directory>
-
<VirtualHost *:80>
ServerAdmin debian-admin@debian.org
DocumentRoot /srv/ftp.root/debian-security
<VirtualHost *:80>
ServerAdmin debian-admin@debian.org
DocumentRoot /srv/ftp.root/debian-security
@@
-60,4
+52,4
@@
ServerSignature On
</VirtualHost>
ServerSignature On
</VirtualHost>
-# vim:
set ts=3 sw=3 et
:
+# vim:
set syn=apache
: