projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note that exim contains tracker-specific configuration
[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
..
e8d8440
100644
(file)
--- a/
modules/roles/templates/apache-archive.debian.org.erb
+++ b/
modules/roles/templates/apache-archive.debian.org.erb
@@
-3,16
+3,7
@@
## 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
##
-<%
- if not binds.kind_of?(Array)
- raise Puppet::Error, "binds variable is not an array"
- end
-
- vhost_listen = binds.map{|x| x+":80" }.join(' ')
-%>
-
-
-<VirtualHost <%= vhost_listen %>>
+<VirtualHost <%= @vhost_listen %>>
ServerAdmin debian-admin@debian.org
ServerName archive.debian.org
<% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%>
ServerAdmin debian-admin@debian.org
ServerName archive.debian.org
<% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%>
@@
-22,13
+13,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>