From 99c0bcb7c34c8ae2ea231f18f24b4bef64827404 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Wed, 24 Feb 2016 23:48:01 +0100
Subject:  * renaming conf directory

---
 app/python/rcal/db.py     |   2 +-
 bin/import_cals.py        |   2 +-
 conf/db.json              | Bin 167 -> 0 bytes
 conf/reddit-import.json   |   6 ------
 config/db.json            | Bin 0 -> 167 bytes
 config/reddit-import.json |   6 ++++++
 6 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 conf/db.json
 delete mode 100644 conf/reddit-import.json
 create mode 100644 config/db.json
 create mode 100644 config/reddit-import.json

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/conf/db.json
deleted file mode 100644
index 936104f..0000000
Binary files a/conf/db.json and /dev/null differ
diff --git a/conf/reddit-import.json b/conf/reddit-import.json
deleted file mode 100644
index f34d522..0000000
--- a/conf/reddit-import.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "cache": "../cache/list.md",
-    "cache_time": 86400,
-    "reddit_url": "https://www.reddit.com/r/MotorsportsCalendar/comments/45uv93/2016_calendar_list.json",
-    "user_agent": "/u/emkael"
-}
diff --git a/config/db.json b/config/db.json
new file mode 100644
index 0000000..936104f
Binary files /dev/null and b/config/db.json differ
diff --git a/config/reddit-import.json b/config/reddit-import.json
new file mode 100644
index 0000000..f34d522
--- /dev/null
+++ b/config/reddit-import.json
@@ -0,0 +1,6 @@
+{
+    "cache": "../cache/list.md",
+    "cache_time": 86400,
+    "reddit_url": "https://www.reddit.com/r/MotorsportsCalendar/comments/45uv93/2016_calendar_list.json",
+    "user_agent": "/u/emkael"
+}
-- 
cgit v1.2.3