server/mirrormanager
by Matt Domsch
server/mirrormanager/templates/master.kid | 11 +++++++++--
server/mirrormanager/templates/static.kid | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 5a439a98cf174f1aee4f75d45ff77cab9d1a5aea
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Mar 24 13:36:45 2010 -0500
another try at setting the page titles
diff --git a/server/mirrormanager/templates/master.kid b/server/mirrormanager/templates/master.kid
index 3f370cc..456af17 100644
--- a/server/mirrormanager/templates/master.kid
+++ b/server/mirrormanager/templates/master.kid
@@ -1,9 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<?python import sitetemplate ?>
+<?python import sitetemplate
+try:
+ page_title = page_title
+except NameError:
+ projectname = tg.config('mirrormanager.projectname', 'Fedora')
+ page_title = '%s Mirror Manager' % projectname
+?>
+
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
<meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
- <title py:replace="''">Your title goes here</title>
+ <title py:replace="page_title" />
<link rel="stylesheet" type="text/css" media="all"
py:attrs="{'href': tg.config('mirrormanager.cssroot', '/mirrormanager/static/css/') + 'fedora.css'}"/>
<link rel="stylesheet" type="text/css" media="all"
diff --git a/server/mirrormanager/templates/static.kid b/server/mirrormanager/templates/static.kid
index 0091593..0829797 100644
--- a/server/mirrormanager/templates/static.kid
+++ b/server/mirrormanager/templates/static.kid
@@ -1,9 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<?python import sitetemplate ?>
+<?python import sitetemplate
+try:
+ page_title = page_title
+except NameError:
+ projectname = tg.config('mirrormanager.projectname', 'Fedora')
+ page_title = '%s Mirror Manager' % projectname
+?>
+
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
<meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
- <title>${page_title}</title>
+ <title py:replace="page_title" />
<link rel="stylesheet" type="text/css" media="all"
py:attrs="{'href': tg.config('mirrormanager.cssroot', '/mirrormanager/static/css/') + 'fedora.css'}"/>
<link rel="stylesheet" type="text/css" media="all"
14 years, 3 months
2 commits - server/dev.cfg server/generate-publiclist server/mirrormanager
by Matt Domsch
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>
14 years, 3 months
server/start-mirrormanager.in
by Matt Domsch
server/start-mirrormanager.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 50a57fecdb9e2347e7639e43d9e9e369b7bd1451
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Thu Mar 18 00:14:05 2010 -0500
s/fedora.tg.util/fedora.tg.tg1utils/ per python-fedora deprecation warning
diff --git a/server/start-mirrormanager.in b/server/start-mirrormanager.in
index 71e4a78..88c4e2b 100644
--- a/server/start-mirrormanager.in
+++ b/server/start-mirrormanager.in
@@ -12,7 +12,7 @@ import cherrypy
cherrypy.lowercase_api = True
from os.path import *
import sys
-from fedora.tg.util import enable_csrf
+from fedora.tg.tg1utils import enable_csrf
if len(sys.argv) > 1:
update_config(configfile=sys.argv[1] ,
14 years, 3 months
server/mirrormanager.wsgi
by Matt Domsch
server/mirrormanager.wsgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53d23576964036dacc40418234a28d1d1e620924
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Thu Mar 18 00:13:03 2010 -0500
s/fedora.tg.util/fedora.tg.tg1utils/ per python-fedora deprecation warning
diff --git a/server/mirrormanager.wsgi b/server/mirrormanager.wsgi
index 56191ff..c056146 100755
--- a/server/mirrormanager.wsgi
+++ b/server/mirrormanager.wsgi
@@ -14,7 +14,7 @@ import cherrypy
import cherrypy._cpwsgi
import atexit
from os.path import exists, dirname, join
-from fedora.tg.util import enable_csrf
+from fedora.tg.tg1utils import enable_csrf
cherrypy.lowercase_api = True
14 years, 3 months
server/mirrormanager
by Matt Domsch
server/mirrormanager/controllers.py | 58 ++++++++++----------
server/mirrormanager/templates/boringdeleteform.kid | 2
server/mirrormanager/templates/boringform.kid | 2
server/mirrormanager/templates/boringhostform.kid | 2
server/mirrormanager/templates/boringsiteform.kid | 2
server/mirrormanager/templates/host.kid | 2
server/mirrormanager/templates/hostcategoryurl.kid | 2
7 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 8c443824afb02bb83091f9b715f3b00ec44225fd
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Mar 17 23:24:25 2010 -0500
set html page titles correctly on all remaining pages
diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index 6e7eb7c..e0f7fd9 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -185,7 +185,7 @@ class SiteAdminController(controllers.Controller, identity.SecureResource, conte
def get(self, id):
v = SiteAdmin.get(id)
- return dict(values=v, site=v.site, title="Site Admin")
+ return dict(values=v, site=v.site, page_title="Site Admin")
@expose(template="mirrormanager.templates.boringsiteform")
def new(self, **kwargs):
@@ -197,7 +197,7 @@ class SiteAdminController(controllers.Controller, identity.SecureResource, conte
siteadmin_check(site, identity)
submit_action = "/siteadmin/0/create?siteid=%s" % siteid
- return dict(form=siteadmin_form, values=None, action=submit_action, title="New Site Admin", site=site)
+ return dict(form=siteadmin_form, values=None, action=submit_action, page_title="New Site Admin", site=site)
@expose(template="mirrormanager.templates.boringsiteform")
@error_handler(new)
@@ -261,7 +261,7 @@ class SiteToSiteController(controllers.Controller, identity.SecureResource, cont
siteadmin_check(site, identity)
submit_action = "/site2site/0/create?siteid=%s" % siteid
- return dict(form=site_to_site_form, values=None, action=submit_action, title="Add Downstream Site", site=site)
+ return dict(form=site_to_site_form, values=None, action=submit_action, page_title="Add Downstream Site", site=site)
@expose()
@validate(form=site_to_site_form)
@@ -348,7 +348,7 @@ class HostController(controllers.Controller, identity.SecureResource, content):
raise redirect("/")
submit_action = "/host/0/create?siteid=%s" % siteid
return dict(form=host_form, values=None, action=submit_action, disabled_fields=self.disabled_fields(),
- title="Create Host", site=Site.get(siteid))
+ page_title="Create Host", site=Site.get(siteid))
@expose(template="mirrormanager.templates.host")
@validate(form=host_form)
@@ -359,7 +359,7 @@ class HostController(controllers.Controller, identity.SecureResource, content):
site = Site.get(siteid)
submit_action = "/host/0/create?siteid=%s" % site.id
errordict = dict(form=host_form, values=None, action=submit_action, disabled_fields=self.disabled_fields(),
- title="Create Host", site=site)
+ page_title="Create Host", site=site)
# handle the validation error
if tg_errors:
@@ -382,7 +382,7 @@ class HostController(controllers.Controller, identity.SecureResource, content):
downstream_siteadmin_check(host.my_site(), identity)
submit_action = "/host/%s/update" % host.id
return dict(form=host_form, values=host, action=submit_action,
- disabled_fields=self.disabled_fields(host=host), title="Host", site=host.site)
+ disabled_fields=self.disabled_fields(host=host), page_title="Host", site=host.site)
@expose(template="mirrormanager.templates.host")
@validate(form=host_form)
@@ -394,7 +394,7 @@ class HostController(controllers.Controller, identity.SecureResource, content):
submit_action = "/host/%s/update" % host.id
turbogears.flash("Error updating Host: %s" % createErrorString(tg_errors))
return dict(form=host_form, values=host, action=submit_action,
- disabled_fields=self.disabled_fields(host=host), title="Host", site=host.site)
+ disabled_fields=self.disabled_fields(host=host), page_title="Host", site=host.site)
if not identity.in_group(admin_group) and kwargs.has_key('admin_active'):
@@ -555,7 +555,7 @@ class HostCategoryController(controllers.Controller, identity.SecureResource, co
class HostListitemController(controllers.Controller, identity.SecureResource, content):
require = identity.not_anonymous()
- title = ""
+ page_title = ""
form = None
def get(self, id):
@@ -571,7 +571,7 @@ class HostListitemController(controllers.Controller, identity.SecureResource, co
siteadmin_check(host.my_site(), identity)
submit_action = "%s/0/create?hostid=%s" % (self.submit_action_prefix, hostid)
- return dict(form=self.form, values=None, action=submit_action, title=self.title, host=host)
+ return dict(form=self.form, values=None, action=submit_action, page_title=self.page_title, host=host)
@expose(template="mirrormanager.templates.boringhostform")
@validate(form=form)
@@ -618,7 +618,7 @@ host_acl_ip_form = widgets.TableForm(fields=HostAclIPFields(),
class HostAclIPController(HostListitemController):
submit_action_prefix = "/host_acl_ip"
- title = "New Host ACL IP"
+ page_title = "New Host ACL IP"
form = host_acl_ip_form
def do_get(self, id):
@@ -638,7 +638,7 @@ host_netblock_form = widgets.TableForm(fields=HostNetblockFields(),
class HostNetblockController(HostListitemController):
submit_action_prefix="/host_netblock"
- title = "New Host Netblock"
+ page_title = "New Host Netblock"
form = host_netblock_form
def do_get(self, id):
@@ -674,7 +674,7 @@ host_country_allowed_form = widgets.TableForm(fields=HostCountryAllowedFields(),
class HostCountryAllowedController(HostListitemController):
submit_action_prefix="/host_country_allowed"
- title = "New Host Country Allowed"
+ page_title = "New Host Country Allowed"
form = host_country_allowed_form
def do_get(self, id):
@@ -698,7 +698,7 @@ host_category_url_form = widgets.TableForm(fields=HostCategoryUrlFields(),
class HostCategoryUrlController(controllers.Controller, identity.SecureResource, content):
require = identity.not_anonymous()
- title = "Host Category URL"
+ page_title = "Host Category URL"
form = host_category_url_form
def get(self, id):
@@ -717,7 +717,7 @@ class HostCategoryUrlController(controllers.Controller, identity.SecureResource,
siteadmin_check(host.my_site(), identity)
submit_action = "/host_category_url/0/create?hcid=%s" % hcid
- return dict(form=self.form, values=None, action=submit_action, title=self.title, host_category=host_category)
+ return dict(form=self.form, values=None, action=submit_action, page_title=self.page_title, host_category=host_category)
@expose(template="mirrormanager.templates.hostcategoryurl")
@validate(form=form)
@@ -769,7 +769,7 @@ class HostCategoryUrlController(controllers.Controller, identity.SecureResource,
def read(self, hcurl):
downstream_siteadmin_check(hcurl.my_site(), identity)
submit_action = "/host_category_url/%s/update" % hcurl.id
- return dict(form=self.form, values=hcurl, action=submit_action, title=self.title, host_category=hcurl.host_category)
+ return dict(form=self.form, values=hcurl, action=submit_action, page_title=self.page_title, host_category=hcurl.host_category)
@expose(template="mirrormanager.templates.hostcategoryurl")
def update(self, hcurl, **kwargs):
@@ -779,7 +779,7 @@ class HostCategoryUrlController(controllers.Controller, identity.SecureResource,
hcurl.set(**kwargs)
hcurl.sync()
submit_action = "/host_category_url/%s/update" % hcurl.id
- return dict(form=self.form, values=hcurl, action=submit_action, title=self.title, host_category=hcurl.host_category)
+ return dict(form=self.form, values=hcurl, action=submit_action, page_title=self.page_title, host_category=hcurl.host_category)
@@ -800,7 +800,7 @@ class ConfirmDeleteFields(widgets.WidgetsList):
class SimpleDbObjectController(controllers.Controller, identity.SecureResource, content):
require = identity.in_group(admin_group)
- title = "My Title"
+ page_title = "My Title"
form = None
myClass = None
url_prefix=None
@@ -813,7 +813,7 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
def new(self, **kwargs):
submit_action = "/%s/0/create" % self.url_prefix
- return dict(form=self.form, values=None, action=submit_action, title=self.title)
+ return dict(form=self.form, values=None, action=submit_action, page_title=self.page_title)
def create(self, **kwargs):
try:
@@ -827,13 +827,13 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
@expose(template="mirrormanager.templates.boringform")
def read(self, obj):
submit_action = "/%s/%s/update" % (self.url_prefix, obj.id)
- return dict(form=self.form, values=obj, action=submit_action, title=self.title)
+ return dict(form=self.form, values=obj, action=submit_action, page_title=self.page_title)
def update(self, obj, **kwargs):
obj.set(**kwargs)
obj.sync()
submit_action = "/%s/%s/update" % (self.url_prefix, obj.id)
- return dict(form=self.form, values=obj, action=submit_action, title=self.title)
+ return dict(form=self.form, values=obj, action=submit_action, page_title=self.page_title)
@expose(template="mirrormanager.templates.boringdeleteform")
def delete(self, obj, **kwargs):
@@ -845,9 +845,9 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
turbogears.redirect("/adminview")
else:
form = confirm_delete_form
- title = "Item Deletion"
+ page_title = "Item Deletion"
submit_action = "/%s/%s/delete?confirmed=1" % (self.url_prefix, obj.id)
- return dict(form=form, values=obj, action=submit_action, title=title)
+ return dict(form=form, values=obj, action=submit_action, page_title=page_title)
#########################################################3
@@ -860,7 +860,7 @@ class ArchFields(widgets.WidgetsList):
arch_form = widgets.TableForm(fields=ArchFields(), submit_text="Create Arch")
class ArchController(SimpleDbObjectController):
- title="Arch"
+ page_title="Arch"
myClass = Arch
url_prefix="arch"
form = arch_form
@@ -882,7 +882,7 @@ class EmbargoedCountryFields(widgets.WidgetsList):
embargoed_country_form = widgets.TableForm(fields=EmbargoedCountryFields(), submit_text="Create Embargoed Country")
class EmbargoedCountryController(SimpleDbObjectController):
- title="Embargoed Country"
+ page_title="Embargoed Country"
myClass = EmbargoedCountry
url_prefix="embargoed_country"
form = embargoed_country_form
@@ -904,7 +904,7 @@ class ProductFields(widgets.WidgetsList):
product_form = widgets.TableForm(fields=ProductFields(), submit_text="Create Product")
class ProductController(SimpleDbObjectController):
- title = "Product"
+ page_title = "Product"
form = product_form
myClass = Product
url_prefix="product"
@@ -930,7 +930,7 @@ class RepositoryFields(widgets.WidgetsList):
repository_form = widgets.TableForm(fields=RepositoryFields(), submit_text="Edit Repository")
class RepositoryController(SimpleDbObjectController):
- title = "Repository"
+ page_title = "Repository"
form = repository_form
myClass = Repository
url_prefix="repository"
@@ -968,7 +968,7 @@ version_form = widgets.TableForm(fields=VersionFields(), submit_text="Create Ver
class VersionController(SimpleDbObjectController):
- title = "Version"
+ page_title = "Version"
myClass = Version
url_prefix="version"
form = version_form
@@ -1003,7 +1003,7 @@ class RepositoryRedirectFields(widgets.WidgetsList):
repository_redirect_form = widgets.TableForm(fields=RepositoryRedirectFields(), submit_text="Create Repository Redirect")
class RepositoryRedirectController(SimpleDbObjectController):
- title = "RepositoryRedirect"
+ page_title = "RepositoryRedirect"
myClass = RepositoryRedirect
url_prefix="repository_redirect"
form = repository_redirect_form
@@ -1030,7 +1030,7 @@ class CountryContinentRedirectFields(widgets.WidgetsList):
country_continent_redirect_form = widgets.TableForm(fields=CountryContinentRedirectFields(), submit_text="Create Country->Continent Redirect")
class CountryContinentRedirectController(SimpleDbObjectController):
- title = "CountryContinentRedirect"
+ page_title = "CountryContinentRedirect"
myClass = CountryContinentRedirect
url_prefix="country_continent_redirect"
form = country_continent_redirect_form
diff --git a/server/mirrormanager/templates/boringdeleteform.kid b/server/mirrormanager/templates/boringdeleteform.kid
index 57c32b4..d7df1c5 100644
--- a/server/mirrormanager/templates/boringdeleteform.kid
+++ b/server/mirrormanager/templates/boringdeleteform.kid
@@ -3,7 +3,7 @@
py:extends="'master.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>${title}</title>
+<title>${page_title}</title>
</head>
<body>
This action is permanent! Item "${values.name}" and all associated data will be erased forever!
diff --git a/server/mirrormanager/templates/boringform.kid b/server/mirrormanager/templates/boringform.kid
index e9a3f83..f0b00e7 100644
--- a/server/mirrormanager/templates/boringform.kid
+++ b/server/mirrormanager/templates/boringform.kid
@@ -3,7 +3,7 @@
py:extends="'master.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>${title}</title>
+<title>${page_title}</title>
</head>
<body>
${form(value=values, action=tg.url(action))}
diff --git a/server/mirrormanager/templates/boringhostform.kid b/server/mirrormanager/templates/boringhostform.kid
index 530a0b9..810f0f8 100644
--- a/server/mirrormanager/templates/boringhostform.kid
+++ b/server/mirrormanager/templates/boringhostform.kid
@@ -3,7 +3,7 @@
py:extends="'master.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>${title}</title>
+<title>${page_title}</title>
</head>
<body>
<p>
diff --git a/server/mirrormanager/templates/boringsiteform.kid b/server/mirrormanager/templates/boringsiteform.kid
index 3e90014..dfa1537 100644
--- a/server/mirrormanager/templates/boringsiteform.kid
+++ b/server/mirrormanager/templates/boringsiteform.kid
@@ -3,7 +3,7 @@
py:extends="'master.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>${title}</title>
+<title>${page_title}</title>
</head>
<body>
<p>
diff --git a/server/mirrormanager/templates/host.kid b/server/mirrormanager/templates/host.kid
index 366c307..bda135e 100644
--- a/server/mirrormanager/templates/host.kid
+++ b/server/mirrormanager/templates/host.kid
@@ -18,7 +18,7 @@ else:
Back to <a href="${tg.url('/site/' + str(site.id))}"><span
py:replace="site.name">Site Name</span></a>
</p>
-<h2>${title}</h2>
+<h2>${page_title}</h2>
${form(value=values, action=tg.url(action), disabled_fields=disabled_fields)}
<p>* = Required</p>
diff --git a/server/mirrormanager/templates/hostcategoryurl.kid b/server/mirrormanager/templates/hostcategoryurl.kid
index f32fc06..cd5c9f5 100644
--- a/server/mirrormanager/templates/hostcategoryurl.kid
+++ b/server/mirrormanager/templates/hostcategoryurl.kid
@@ -3,7 +3,7 @@
py:extends="'master.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>${title}</title>
+<title>${page_title}</title>
<?python
host = host_category.host
?>
14 years, 3 months
server/apache
by Matt Domsch
server/apache/mirrormanager.conf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e7f7d93c860958916a68447c87d46d9b4fa848a6
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Mar 17 10:17:52 2010 -0500
apache: ensure aliases to special areas come before the WSGI alias
diff --git a/server/apache/mirrormanager.conf b/server/apache/mirrormanager.conf
index 9b5c5d6..012ab48 100644
--- a/server/apache/mirrormanager.conf
+++ b/server/apache/mirrormanager.conf
@@ -1,3 +1,6 @@
+Alias /mirrormanager/static /usr/share/mirrormanager/server/mirrormanager/static
+Alias /mirrormanager/crawler /var/log/mirrormanager/crawler
+
WSGISocketPrefix /var/run/mirrormanager/wsgi
WSGIRestrictSignal Off
@@ -11,10 +14,8 @@ WSGIScriptAlias /mirrormanager /usr/share/mirrormanager/server/mirrormanager.wsg
Order deny,allow
Allow from all
</Directory>
-Alias /mirrormanager/static /usr/share/mirrormanager/server/mirrormanager/static
<Directory /var/log/mirrormanager/crawler>
Order deny,allow
Allow from all
</Directory>
-Alias /mirrormanager/crawler /var/log/mirrormanager/crawler
14 years, 3 months
server/mirrormanager
by Matt Domsch
server/mirrormanager/templates/host.kid | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6b4659363e9cc82efdd6652e4b439489e36bd338
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Mar 1 12:09:05 2010 -0600
add crawler log link on host page
diff --git a/server/mirrormanager/templates/host.kid b/server/mirrormanager/templates/host.kid
index adcda3a..366c307 100644
--- a/server/mirrormanager/templates/host.kid
+++ b/server/mirrormanager/templates/host.kid
@@ -25,7 +25,7 @@ ${form(value=values, action=tg.url(action), disabled_fields=disabled_fields)}
<div py:if="values is not None and action.endswith('update')">
Last Checked In: ${values.lastCheckedIn}<br></br>
-Last Crawled: ${values.lastCrawled}<br></br>
+Last Crawled: ${values.lastCrawled} <a href="${tg.url('/crawler/'+str(values.id)+'.log')}">[Log]</a><br></br>
<div py:if="is_siteadmin">
14 years, 3 months
2 commits - server/apache server/generate-publiclist server/mirrormanager
by Matt Domsch
server/apache/mirrormanager.conf | 6 ++++++
server/generate-publiclist | 2 +-
server/mirrormanager/controllers.py | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 48b4c689ab6c3cd329463ac85db2f0936d5be842
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Mar 1 12:03:41 2010 -0600
expose crawler logs via apache directory listing
diff --git a/server/apache/mirrormanager.conf b/server/apache/mirrormanager.conf
index 9600e77..9b5c5d6 100644
--- a/server/apache/mirrormanager.conf
+++ b/server/apache/mirrormanager.conf
@@ -12,3 +12,9 @@ WSGIScriptAlias /mirrormanager /usr/share/mirrormanager/server/mirrormanager.wsg
Allow from all
</Directory>
Alias /mirrormanager/static /usr/share/mirrormanager/server/mirrormanager/static
+
+<Directory /var/log/mirrormanager/crawler>
+ Order deny,allow
+ Allow from all
+</Directory>
+Alias /mirrormanager/crawler /var/log/mirrormanager/crawler
diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index b87c93d..6e7eb7c 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -1051,6 +1051,10 @@ class CountryContinentRedirectController(SimpleDbObjectController):
class Root(controllers.RootController):
+ # reserved for other uses outside TG
+ static = None
+ crawler = None
+
site = SiteController()
siteadmin = SiteAdminController()
host = HostController()
commit e9e35e5006b29147c25f4465d3a9421fe3799670
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Mar 1 12:02:59 2010 -0600
finish fixing titles
diff --git a/server/generate-publiclist b/server/generate-publiclist
index 6922836..a8128e8 100755
--- a/server/generate-publiclist
+++ b/server/generate-publiclist
@@ -163,7 +163,7 @@ def generate_one_html(engine, pvaMatrix, productname=None, vername=None, archnam
bandwidth = bandwidth + h.bandwidth_int
bandwidth = bandwidth / 1024 # convert to Gb
- template_data = dict(title=title, hosts=hosts, numhosts=len(hosts), bandwidth=bandwidth,
+ template_data = dict(page_title=title, hosts=hosts, numhosts=len(hosts), bandwidth=bandwidth,
pvaMatrix=pvaMatrix,
pva=pva,
products=list(Product.select(orderBy='name')),
14 years, 3 months