[snapshot/master] use config's snapshot.masterdomain in routes and in the root page
---
web/app/snapshot/config/deployment.ini_tmpl | 1 +
web/app/snapshot/config/routing.py | 2 +-
web/app/snapshot/templates/root.mako | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/web/app/snapshot/config/deployment.ini_tmpl b/web/app/snapshot/config/deployment.ini_tmpl
index 0be4f79..f8aac3a 100644
--- a/web/app/snapshot/config/deployment.ini_tmpl
+++ b/web/app/snapshot/config/deployment.ini_tmpl
@@ -25,6 +25,7 @@ beaker.session.secret = ${app_instance_secret}
app_instance_uuid = ${app_instance_uuid}
snapshot.domain = snapshot.debian.org
+snapshot.masterdomain = snapshot-master.debian.org
snapshot.db.host = localhost
snapshot.db.port = 5433
snapshot.db.database = snapshot
diff --git a/web/app/snapshot/config/routing.py b/web/app/snapshot/config/routing.py
index 8e5a48e..b6e0c9c 100644
--- a/web/app/snapshot/config/routing.py
+++ b/web/app/snapshot/config/routing.py
@@ -50,7 +50,7 @@ def make_map():
map.connect('/removal/', controller='removal', action='root')
map.connect('/removal/{id}', controller='removal', action='one')
- map.connect('/project/trace/snapshot-master.debian.org', controller='misc', action='trace')
+ map.connect('/project/trace/%s' % config['app_conf']['snapshot.masterdomain'], controller='misc', action='trace')
#map.connect('/{controller}/{action}')
#map.connect('/{controller}/{action}/{id}')
diff --git a/web/app/snapshot/templates/root.mako b/web/app/snapshot/templates/root.mako
index b570009..0ceeb6a 100644
--- a/web/app/snapshot/templates/root.mako
+++ b/web/app/snapshot/templates/root.mako
@@ -46,7 +46,7 @@ Search in the index of source packages:<br />
<li><a href="oldnews">older news</a></li>
<li><a href="http://lists.debian.org/debian-snapshot/";>mailinglist</a></li>
<li><a href="http://git.debian.org/?p=mirror/snapshot.debian.org.git;a=blob_plain;f=API";>machine-usable interface</a></li>
- <li><a href="http://snapshot-master.debian.org/removal/";>removal logs</a></li>
+ <li><a href="http://${config['app_conf']['snapshot.masterdomain']}/removal">removal logs</a></li>
</ul>
</td>
--
1.5.6.5
Reply to: