diff options
| author | emkael <emkael@tlen.pl> | 2016-02-24 23:48:01 +0100 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-02-24 23:48:01 +0100 |
| commit | 99c0bcb7c34c8ae2ea231f18f24b4bef64827404 (patch) | |
| tree | 3b196edf6c222c6b8c454320879c77159908c3e6 | |
| parent | 2173f7d7613b5158f4bb2f71a02df353c058c1ee (diff) | |
* renaming conf directory
| -rw-r--r-- | app/python/rcal/db.py | 2 | ||||
| -rw-r--r-- | bin/import_cals.py | 2 | ||||
| -rw-r--r-- | config/db.json (renamed from conf/db.json) | bin | 167 -> 167 bytes | |||
| -rw-r--r-- | config/reddit-import.json (renamed from conf/reddit-import.json) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/app/python/rcal/db.py b/app/python/rcal/db.py index 68d5b0d..c5b05f6 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__)), '../../..', 'conf', 'db.json'))) + path.realpath(__file__)), '../../..', 'config', 'db.json'))) db_str = url.URL( drivername=config['type'], host=config['host'], diff --git a/bin/import_cals.py b/bin/import_cals.py index 41f5542..c21eb0c 100644 --- a/bin/import_cals.py +++ b/bin/import_cals.py @@ -12,7 +12,7 @@ CONFIG = json.load(open( os.path.join( os.path.dirname(os.path.realpath(__file__)), '..', - 'conf', + 'config', 'reddit-import.json'), 'r')) diff --git a/conf/db.json b/config/db.json Binary files differindex 936104f..936104f 100644 --- a/conf/db.json +++ b/config/db.json diff --git a/conf/reddit-import.json b/config/reddit-import.json index f34d522..f34d522 100644 --- a/conf/reddit-import.json +++ b/config/reddit-import.json |