fixed migration and setup

more info: https://github.com/knex/knex/issues/2820

backend/migrations/20190227065017_settings.js

@@ -22,22 +22,6 @@ exports.up = function (knex/*, Promise*/) {
 	})
 		.then(() => {
 			logger.info('[' + migrate_name + '] setting Table created');
-
-			// TODO: add settings
-			let settingModel = require('../models/setting');
-
-			return settingModel
-				.query()
-				.insert({
-					id:          'default-site',
-					name:        'Default Site',
-					description: 'What to show when Nginx is hit with an unknown Host',
-					value:       'congratulations',
-					meta:        {}
-				});
-		})
-		.then(() => {
-			logger.info('[' + migrate_name + '] Default settings added');
 		});
 };
 

backend/setup.js

@@ -5,10 +5,10 @@ const logger              = require('./logger').setup;
 const userModel           = require('./models/user');
 const userPermissionModel = require('./models/user_permission');
 const authModel           = require('./models/auth');
+const settingModel        = require('./models/setting');
 const debug_mode          = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;
 
-module.exports = function () {
-	return new Promise((resolve, reject) => {
+function setupJwt(resolve, reject) {
 	// Now go and check if the jwt gpg keys have been created and if not, create them
 	if (!config.has('jwt') || !config.has('jwt.key') || !config.has('jwt.pub')) {
 		logger.info('Creating a new JWT key pair...');
@@ -56,15 +56,15 @@ module.exports = function () {
 
 		resolve();
 	}
-	})
-		.then(() => {
-			return userModel
+}
+
+function setupDefaultUser() {
+	(userModel
 		.query()
 		.select(userModel.raw('COUNT(`id`) as `count`'))
 		.where('is_deleted', 0)
-				.first();
-		})
-		.then((row) => {
+		.first()
+	).then( (row) => {
 		if (!row.count) {
 			// Create a new user and set password
 			logger.info('Creating a new user: admin@example.com with password: changeme');
@@ -106,10 +106,44 @@ module.exports = function () {
 						});
 				})
 				.then(() => {
-						logger.info('Initial setup completed');
+					logger.info('Initial admin setup completed');
 				});
 		} else if (debug_mode) {
 			logger.debug('Admin user setup not required');
 		}
 	});
+}
+
+function setupDefaultSettings() {
+	return settingModel
+		.query()
+		.select(userModel.raw('COUNT(`id`) as `count`'))
+		.first()
+		.then( (row) => {
+			if (!row.count) {
+				settingModel
+					.query()
+					.insert({
+						id:          'default-site',
+						name:        'Default Site',
+						description: 'What to show when Nginx is hit with an unknown Host',
+						value:       'congratulations',
+						meta:        {}
+					}).then(() => {
+						logger.info('Default settings added');
+					});
+			} if (debug_mode) {
+				logger.debug('Default setting setup not required');
+			}
+		});
+}
+
+module.exports = function () {
+	return new Promise((resolve, reject) => {
+		return setupJwt(resolve, reject);
+	}).then(() => {
+		return setupDefaultUser();
+	}).then(() => {
+		return setupDefaultSettings();
+	});
 };