merge userdb.js into users.js

src/cloudron.js

@@ -50,7 +50,8 @@ const apps = require('./apps.js'),
     split = require('split'),
     sysinfo = require('./sysinfo.js'),
     tasks = require('./tasks.js'),
-    users = require('./users.js');
+    users = require('./users.js'),
+    util = require('util');
 
 const REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh');
 
@@ -125,7 +126,7 @@ function runStartupTasks() {
 
         // check activation state and start the platform
         function (callback) {
-            users.isActivated(function (error, activated) {
+            util.callbackify(users.isActivated)(function (error, activated) {
                 if (error) return callback(error);
 
                 // configure nginx to be reachable by IP when not activated. for the moment, the IP based redirect exists even after domain is setup