projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't hardcode bacula director host name
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
syncproxy
/
syncproxy.debian.org-apache.erb
diff --git
a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index
ab4ca59
..
ef5fbb7
100644
(file)
--- a/
modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/
modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@
-3,11
+3,11
@@
## 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
##
-<% @
binds
.each do |bind| -%>
+<% @
enclosed_addresses_apache
.each do |bind| -%>
Use common-debian-service-https-redirect "<%= bind %>" "<%= @syncproxy_name %>"
<% end -%>
Use common-debian-service-https-redirect "<%= bind %>" "<%= @syncproxy_name %>"
<% end -%>
-<Virtualhost <%= @
binds
.map { |bind| "#{bind}:443" }.join(' ') %> >
+<Virtualhost <%= @
enclosed_addresses_apache
.map { |bind| "#{bind}:443" }.join(' ') %> >
ServerName <%= @syncproxy_name %>
DocumentRoot /srv/www/syncproxy.debian.org/htdocs
ServerName <%= @syncproxy_name %>
DocumentRoot /srv/www/syncproxy.debian.org/htdocs