summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2016-04-20 17:14:35 +0200
committeremkael <emkael@tlen.pl>2016-04-20 17:14:35 +0200
commit4e9251ea265a24e749b7756da2585663e8f85232 (patch)
tree7b35a33765109a98cceeb8f188be486807773767
parent07dc0f74569f5ad990f34c01944fe5a93181a26d (diff)
* config paths as symlinks to common config
l---------app/php/db/config.json1
-rw-r--r--app/php/db/config.xml2
l---------app/python/db.json1
-rw-r--r--app/python/rcal/db.py2
4 files changed, 4 insertions, 2 deletions
diff --git a/app/php/db/config.json b/app/php/db/config.json
new file mode 120000
index 0000000..89a492f
--- /dev/null
+++ b/app/php/db/config.json
@@ -0,0 +1 @@
+../../../config/db.json \ No newline at end of file
diff --git a/app/php/db/config.xml b/app/php/db/config.xml
index d07618c..20b1c4c 100644
--- a/app/php/db/config.xml
+++ b/app/php/db/config.xml
@@ -3,6 +3,6 @@
<modules>
<module id="db"
class="Application.db.DBModule"
- config="../../config/db.json" />
+ config="db/config.json" />
</modules>
</configuration>
diff --git a/app/python/db.json b/app/python/db.json
new file mode 120000
index 0000000..f6ad526
--- /dev/null
+++ b/app/python/db.json
@@ -0,0 +1 @@
+../../config/db.json \ No newline at end of file
diff --git a/app/python/rcal/db.py b/app/python/rcal/db.py
index c5b05f6..63561d7 100644
--- a/app/python/rcal/db.py
+++ b/app/python/rcal/db.py
@@ -13,7 +13,7 @@ class Session(object):
def __init__(self):
config = json.load(
open(path.join(path.dirname(
- path.realpath(__file__)), '../../..', 'config', 'db.json')))
+ path.realpath(__file__)), '..', 'db.json')))
db_str = url.URL(
drivername=config['type'],
host=config['host'],