projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix archive mirror bind magic
[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
a4b1f9c
..
6dad6dc
100644
(file)
--- a/
modules/roles/templates/apache-archive.debian.org.erb
+++ b/
modules/roles/templates/apache-archive.debian.org.erb
@@
-3,6
+3,15
@@
## 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 %>>
ServerAdmin debian-admin@debian.org
ServerName archive.debian.org
<VirtualHost <%= vhost_listen %>>
ServerAdmin debian-admin@debian.org
ServerName archive.debian.org
@@
-19,7
+28,6
@@
<Directory <%= archive_root %>>
Require all granted
<Directory <%= archive_root %>>
Require all granted
- IndexOptions NameWidth=* +SuppressDescription
Options +Indexes +FollowSymLinks
</Directory>
Options +Indexes +FollowSymLinks
</Directory>