server/dev.cfg | 1 +
server/generate-publiclist | 5 +++--
server/mirrormanager/templates/publiclist.kid | 11 +++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 4122d0097a3ca56cd21dbe564c7332879f661aab
Merge: 45e6296... 50a57fe...
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Mar 22 16:44:16 2010 -0500
Merge branch 'master' of
ssh+git://git.fedorahosted.org/git/mirrormanager
commit 45e6296c0b71d07b83134d3d5f0f6e9ba2306b7a
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Mar 22 16:40:58 2010 -0500
add config option report_problems_to_email, display on publiclist footer.
diff --git a/server/dev.cfg b/server/dev.cfg
index bdf487e..ef35022 100644
--- a/server/dev.cfg
+++ b/server/dev.cfg
@@ -9,6 +9,7 @@
#mirrormanager.upstream = "rsync://download1.rpmfusion.org/rpmfusion/"
#mirrormanager.max_ipv4_netblock_size = '/16'
#mirrormanager.max_ipv6_netblock_size = '/32'
+#mirrormanager.report_problems_to_email = 'mirror-admin at fedoraproject.org'
# Account System group that manages this mirrormanager instance.
# members in this group can override some checks, and can see content
# that people not in this group cannot.
diff --git a/server/generate-publiclist b/server/generate-publiclist
index a8128e8..2ac16a1 100755
--- a/server/generate-publiclist
+++ b/server/generate-publiclist
@@ -162,12 +162,13 @@ def generate_one_html(engine, pvaMatrix, productname=None,
vername=None, archnam
for h in hosts:
bandwidth = bandwidth + h.bandwidth_int
bandwidth = bandwidth / 1024 # convert to Gb
-
+
template_data = dict(page_title=title, hosts=hosts, numhosts=len(hosts),
bandwidth=bandwidth,
pvaMatrix=pvaMatrix,
pva=pva,
products=list(Product.select(orderBy='name')),
- arches=publiclist_arches())
+ arches=publiclist_arches(),
+ report_problems_to_email =
config.get('mirrormanager.report_problems_to_email', 'webmaster'))
t=engine.load_template('mirrormanager.templates.publiclist')
out_html = _process_output(template_data, template=t, format='html',
engine=engine)
diff --git a/server/mirrormanager/templates/publiclist.kid
b/server/mirrormanager/templates/publiclist.kid
index 297633b..e71e5ca 100644
--- a/server/mirrormanager/templates/publiclist.kid
+++ b/server/mirrormanager/templates/publiclist.kid
@@ -97,5 +97,16 @@ and development networks globally.
</tr>
</table>
</div>
+
+<div id="bottom">
+ <div id="footer">
+ <p class="disclaimer">
+ Listing generated
+ by <a
href="http://mirrormanager.org/">MirrorManager</a>.
+ Please direct questions or problems with this list to ${report_problems_to_email}.
+ </p>
+ </div>
+</div>
+
</body>
</html>