X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Fsyncproxy.debian.org-index.html.erb;h=4d16f1bde1c088fcc5550ce5c282338b932170ef;hb=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=f1be122cffb960c27e84b84dd5feec55ffbc67b7;hpb=810511398d02d8b7ebeafcbe6dcd6cdd86add92e;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
index f1be122cf..4d16f1bde 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
@@ -1,13 +1,13 @@
- Welcome to <%= syncproxy_name %>!
+ Welcome to <%= @syncproxy_name %>!
-Welcome to <%= syncproxy_name %>!
+Welcome to <%= @syncproxy_name %>!
-This is <%= syncproxy_name %>, a syncproxy run by and for the , a syncproxy run by and for the Debian Project to aid in mirroring
our software. Consult the
mirrors section of the Debian website for more information.
@@ -18,9 +18,9 @@ This syncproxy contains copies of the following archives.
<%=
lines = []
-%w{debian debian-debug debian-security}.each do |archive|
- varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
- if has_variable?(varname) and (eval(varname)) == 'true'
+%w{debian debian-debug debian-ports debian-security}.each do |archive|
+ varname = ('has' + @mirror_basedir_prefix + archive).gsub(/[\/-]/,'_')
+ if has_variable?(varname) and (eval("@"+varname))
lines << "- #{archive} [trace directory]
"
end
end