X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Fsyncproxy.debian.org-index.html.erb;h=4d16f1bde1c088fcc5550ce5c282338b932170ef;hb=873800639f512b928cf1a07a69898f5f66fbfb83;hp=876577f2a8edd2c299d9c3f5fecac61cb0e9a6e4;hpb=6718d9e8c7aaafa9710e57a4a861cad02634c79d;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 876577f2a..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. @@ -19,8 +19,8 @@ This syncproxy contains copies of the following archives. <%= lines = [] %w{debian debian-debug debian-ports debian-security}.each do |archive| - varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_') - if has_variable?(varname) and (eval(varname)) + varname = ('has' + @mirror_basedir_prefix + archive).gsub(/[\/-]/,'_') + if has_variable?(varname) and (eval("@"+varname)) lines << "
  • #{archive} [trace directory]
  • " end end