From: Simo Sorce <simo@redhat.com>
Date: Thu, 25 Sep 2014 18:36:32 +0000 (-0400)
Subject: Add transactions db default paths
X-Git-Tag: v0.3.0~78
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=a61d6f1b713836d0614eaa6f1ea033420e73dd6f

Add transactions db default paths

Fixes installation and quickrun

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---

diff --git a/quickrun.py b/quickrun.py
index 8157f80..b8af4b2 100755
--- a/quickrun.py
+++ b/quickrun.py
@@ -43,6 +43,7 @@ base.mount = "/idp"
 base.dir = "${BASEDIR}"
 admin.config.db = "${ADMINDB}"
 user.prefs.db = "${USERSDB}"
+transactions.db = "${TRANSDB}"
 
 tools.sessions.on = True
 tools.sessions.storage_type = "file"
@@ -78,11 +79,14 @@ def config(workdir):
         f.write(USERS_TEMPLATE)
     subprocess.call(['sqlite3', '-init', sql, users_db, '.quit'])
 
+    trans_db = os.path.join(workdir, 'transactions.sqlite')
+
     t = Template(CONF_TEMPLATE)
     text = t.substitute({'BASEDIR': os.getcwd(),
                          'WORKDIR': workdir,
                          'ADMINDB': admin_db,
-                         'USERSDB': users_db})
+                         'USERSDB': users_db,
+                         'TRANSDB': trans_db})
     conf = os.path.join(workdir, 'ipsilon.conf')
     with open(conf, 'w+') as f:
         f.write(text)
diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf
index 803246d..99491db 100644
--- a/templates/install/ipsilon.conf
+++ b/templates/install/ipsilon.conf
@@ -6,6 +6,7 @@ base.mount = "/${instance}"
 base.dir = "${staticdir}"
 admin.config.db = "${datadir}/adminconfig.sqlite"
 user.prefs.db = "${datadir}/userprefs.sqlite"
+transactions.db = "${datadir}/transactions.sqlite"
 
 tools.sessions.on = True
 tools.sessions.name = "${instance}_ipsilon_session_id"