[snapshot/master] adding web-ini config snapshot.domain and use its interpolation for snapshot.farmpath
---
web/app/development.ini | 3 ++-
web/app/snapshot/config/deployment.ini_tmpl | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/web/app/development.ini b/web/app/development.ini
index ed96284..6e21f0e 100644
--- a/web/app/development.ini
+++ b/web/app/development.ini
@@ -24,12 +24,13 @@ cache_dir = %(here)s/data
beaker.session.key = snapshot
beaker.session.secret = somesecret
+snapshot.domain = snapshot.debian.org
snapshot.db.host = localhost
snapshot.db.port = 5433
snapshot.db.database = snapshot
snapshot.db.user = guest
-snapshot.farmpath = /srv/snapshot.debian.org/farm
+snapshot.farmpath = /srv/%(snapshot.domain)s/farm
expires.static = 900
diff --git a/web/app/snapshot/config/deployment.ini_tmpl b/web/app/snapshot/config/deployment.ini_tmpl
index e41684d..86796b5 100644
--- a/web/app/snapshot/config/deployment.ini_tmpl
+++ b/web/app/snapshot/config/deployment.ini_tmpl
@@ -24,12 +24,13 @@ beaker.session.key = snapshot
beaker.session.secret = ${app_instance_secret}
app_instance_uuid = ${app_instance_uuid}
+snapshot.domain = snapshot.debian.org
snapshot.db.host = localhost
snapshot.db.port = 5433
snapshot.db.database = snapshot
snapshot.db.user = guest
-snapshot.farmpath = /srv/snapshot.debian.org/farm
+snapshot.farmpath = /srv/%(snapshot.domain)s/farm
expires.static = 900
--
1.5.6.5
Reply to: