Merge pull request #758 from SISheogorath/cleanup/config

Change config to camel case with backwards compatibility

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/models/index.js b/lib/models/index.js
index e3aa8bf3..0a44ca87 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -15,8 +15,8 @@ dbconfig.logging = config.debug ? logger.info : false
 var sequelize = null
 
 // Heroku specific
-if (config.dburl) {
-  sequelize = new Sequelize(config.dburl, dbconfig)
+if (config.dbURL) {
+  sequelize = new Sequelize(config.dbURL, dbconfig)
 } else {
   sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig)
 }
diff --git a/lib/models/note.js b/lib/models/note.js
index d615bcf7..69393dd4 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -148,7 +148,7 @@ module.exports = function (sequelize, DataTypes) {
               }
             }).then(function (note) {
               if (note) {
-                let filePath = path.join(config.docspath, noteId + '.md')
+                let filePath = path.join(config.docsPath, noteId + '.md')
                 if (Note.checkFileExist(filePath)) {
                   // if doc in filesystem have newer modified time than last change time
                   // then will update the doc in db
@@ -190,7 +190,7 @@ module.exports = function (sequelize, DataTypes) {
                   return callback(null, note.id)
                 }
               } else {
-                var filePath = path.join(config.docspath, noteId + '.md')
+                var filePath = path.join(config.docsPath, noteId + '.md')
                 if (Note.checkFileExist(filePath)) {
                   Note.create({
                     alias: noteId,
@@ -520,16 +520,16 @@ module.exports = function (sequelize, DataTypes) {
           var body = null
           let filePath = null
           if (!note.alias) {
-            filePath = config.defaultnotepath
+            filePath = config.defaultNotePath
           } else {
-            filePath = path.join(config.docspath, note.alias + '.md')
+            filePath = path.join(config.docsPath, note.alias + '.md')
           }
           if (Note.checkFileExist(filePath)) {
             var fsCreatedTime = moment(fs.statSync(filePath).ctime)
             body = fs.readFileSync(filePath, 'utf8')
             note.title = Note.parseNoteTitle(body)
             note.content = body
-            if (filePath !== config.defaultnotepath) {
+            if (filePath !== config.defaultNotePath) {
               note.createdAt = fsCreatedTime
             }
           }
@@ -537,7 +537,7 @@ module.exports = function (sequelize, DataTypes) {
         // if no permission specified and have owner then give default permission in config, else default permission is freely
         if (!note.permission) {
           if (note.ownerId) {
-            note.permission = config.defaultpermission
+            note.permission = config.defaultPermission
           } else {
             note.permission = 'freely'
           }