projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
apache-archive.debian.org.erb
diff --git
a/modules/roles/templates/apache-archive.debian.org.erb
b/modules/roles/templates/apache-archive.debian.org.erb
index
84026e8
..
0cf3b0c
100644
(file)
--- a/
modules/roles/templates/apache-archive.debian.org.erb
+++ b/
modules/roles/templates/apache-archive.debian.org.erb
@@
-4,11
+4,11
@@
##
<%
##
<%
- if not binds.kind_of?(Array)
+ if not
@
binds.kind_of?(Array)
raise Puppet::Error, "binds variable is not an array"
end
raise Puppet::Error, "binds variable is not an array"
end
- vhost_listen = binds.map{|x| x+":80" }.join(' ')
+ vhost_listen =
@
binds.map{|x| x+":80" }.join(' ')
%>
%>
@@
-22,13
+22,13
@@
ServerAlias *.archive.backend.mirrors.debian.org
#RedirectMatch "^/$" /debian-archive/
ServerAlias *.archive.backend.mirrors.debian.org
#RedirectMatch "^/$" /debian-archive/
- DocumentRoot <%= archive_root %>/
- Alias /debian-archive/ <%= archive_root %>/
+ DocumentRoot <%=
@
archive_root %>/
+ Alias /debian-archive/ <%=
@
archive_root %>/
ErrorLog /var/log/apache2/archive.debian.org-error.log
CustomLog /var/log/apache2/archive.debian.org-access.log privacy
ErrorLog /var/log/apache2/archive.debian.org-error.log
CustomLog /var/log/apache2/archive.debian.org-access.log privacy
- <Directory <%= archive_root %>>
+ <Directory <%=
@
archive_root %>>
Require all granted
Options +Indexes +FollowSymLinks
</Directory>
Require all granted
Options +Indexes +FollowSymLinks
</Directory>