Add 1.10.2 changes

Keep the invite email for users, which have not yet setup a username
createReleaseTarball: Make sure we pick the current branch on webadmin
2018-02-07 15:34:24 +01:00 · 2018-02-07 15:33:35 +01:00 · 2018-02-06 16:18:42 -08:00 · 2018-02-06 16:11:21 -08:00 · 2018-02-06 12:19:13 +01:00 · 2018-02-04 15:08:48 -08:00
297 changed files with 19596 additions and 59942 deletions
@@ -1,7 +1,6 @@
 node_modules/
 coverage/
 webadmin/dist/
-setup/splash/website/
 installer/src/certs/server.key

 # vim swap files
@@ -1102,3 +1102,106 @@
 * Send user and cert info in digest emails
 * Send oom, app failures and other important mails to cloudron owner's alt mail

+[1.8.0]
+* Fix group email bounce when a group has users that have not signed up yet
+* Do not restrict app memory limit to 4GB
+* Fix display of the latest backup in the weekly digest
+* Add UI to select users for access restriction
+* Update docker to 17.09
+* Update node to 6.11.5
+* Display package version of installed apps in the info dialog
+
+[1.8.1]
+* Update node modules
+* Allow a restore operation if app is already restoring
+* Remove pre-install bundle support since it was hardly used
+* Make the test email mail address configurable
+* Allow admins to access all apps
+* Send feedback via appstore API (instead of email)
+* Show documentation URL in the app info dialog
+* Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
+
+[1.8.2]
+* Update node modules
+* Allow a restore operation if app is already restoring
+* Remove pre-install bundle support since it was hardly used
+* Make the test email mail address configurable
+* Allow admins to access all apps
+* Send feedback via appstore API (instead of email)
+* Show documentation URL in the app info dialog
+* Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
+
+[1.8.3]
+* Ensure domain database record exists
+
+[1.8.4]
+* Fix issue where internal email was not delivered when email relay is enabled
+* Fix display of DNS records when email relay is enabled
+
+[1.8.5]
+* Fix issues where unused addons were not cleaned on an app update causing uninstall to fail
+* Change UI text from 'Waiting' to 'Pending'
+
+[1.9.0]
+* Prepare Cloudron for supporting multiple domains
+* Add Cloudron restore UI
+* Do not put app in errored state if backup fails
+* Display backup progress in CaaS
+* Add Google Cloud Storage backend for backups
+* Update node to 8.9.3 LTS
+* Set max email recepient limit (in outgoing emails) to 500
+
+[1.9.1]
+* Prepare Cloudron for supporting multiple domains
+* Add Cloudron restore UI
+* Do not put app in errored state if backup fails
+* Display backup progress in CaaS
+* Add Google Cloud Storage backend for backups
+* Update node to 8.9.3 LTS
+* Set max email recepient limit (in outgoing emails) to 500
+* Put terminal and app logs viewer to separate window
+
+[1.9.2]
+* Prepare Cloudron for supporting multiple domains
+* Add Cloudron restore UI
+* Do not put app in errored state if backup fails
+* Display backup progress in CaaS
+* Add Google Cloud Storage backend for backups
+* Update node to 8.9.3 LTS
+* Set max email recepient limit (in outgoing emails) to 500
+* Put terminal and app logs viewer to separate window
+
+[1.9.3]
+* Prepare Cloudron for supporting multiple domains
+* Add Cloudron restore UI
+* Do not put app in errored state if backup fails
+* Display backup progress in CaaS
+* Add Google Cloud Storage backend for backups
+* Update node to 8.9.3 LTS
+* Set max email recepient limit (in outgoing emails) to 500
+* Put terminal and app logs viewer to separate window
+
+[1.9.4]
+* Fix typo causing LE cert renewals to fail
+
+[1.10.0]
+* Migrate mailboxes to support multiple domains
+* Update addon containers to latest versions
+* Add DigitalOcean Spaces region Singapore 1 (SGP1)
+* Configure Exoscale SOS to use new SOS NG endpoint
+* Fix S3 storage backend CopySource encoding rules
+
+[1.10.1]
+* Migrate mailboxes to support multiple domains
+* Update addon containers to latest versions
+* Add DigitalOcean Spaces region Singapore 1 (SGP1)
+* Configure Exoscale SOS to use new SOS NG endpoint
+* Fix S3 storage backend CopySource encoding rules
+
+[1.10.2]
+* Migrate mailboxes to support multiple domains
+* Update addon containers to latest versions
+* Add DigitalOcean Spaces region Singapore 1 (SGP1)
+* Configure Exoscale SOS to use new SOS NG endpoint
+* Fix S3 storage backend CopySource encoding rules
+
@@ -630,7 +630,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    box
-    Copyright (C) 2016 Cloudron UG
+    Copyright (C) 2016,2017 Cloudron UG

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published
@@ -9,10 +9,6 @@ a complex task.
 We are building the ultimate platform for self-hosting web apps. The Cloudron allows
 anyone to effortlessly host web applications on their server on their own terms.

-Support us on
-[![Flattr Cloudron](https://button.flattr.com/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=cloudron&url=https://cloudron.io&title=Cloudron&tags=opensource&category=software)
-or [pay us a coffee](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8982CKNM46D8U)
-
 ## Features

 * Single click install for apps. Check out the [App Store](https://cloudron.io/appstore.html).
@@ -33,9 +29,9 @@ or [pay us a coffee](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_
 * Trivially migrate to another server keeping your apps and data (for example, switch your
  infrastructure provider or move to a bigger server).

-* Comprehensive [REST API](https://cloudron.io/references/api.html).
+* Comprehensive [REST API](https://cloudron.io/documentation/developer/api/).

-* [CLI](https://git.cloudron.io/cloudron/cloudron-cli) to configure apps.
+* [CLI](https://cloudron.io/documentation/cli/) to configure apps.

 * Alerts, audit logs, graphs, dns management ... and much more

@@ -49,33 +45,18 @@ You can install the Cloudron platform on your own server or get a managed server
 from cloudron.io. In either case, the Cloudron platform will keep your server and
 apps up-to-date and secure.

-* [Selfhosting](https://cloudron.io/references/selfhosting.html) - [Pricing](https://cloudron.io/pricing.html)
+* [Selfhosting](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
 * [Managed Hosting](https://cloudron.io/managed.html)

-The wiki has instructions on how you can install and update the Cloudron and the
-apps from source.
-
 ## Documentation

-* [User manual](https://cloudron.io/references/usermanual.html)
-* [Developer docs](https://cloudron.io/documentation.html)
-* [Architecture](https://cloudron.io/references/architecture.html)
+* [Documentation](https://cloudron.io/documentation/)

 ## Related repos

 The [base image repo](https://git.cloudron.io/cloudron/docker-base-image) is the parent image of all
 the containers in the Cloudron.

-The [graphite repo](https://git.cloudron.io/cloudron/docker-graphite) contains the graphite code
-that collects metrics for graphs.
-
-The addons are located in separate repositories
-* [Redis](https://git.cloudron.io/cloudron/redis-addon)
-* [Postgresql](https://git.cloudron.io/cloudron/postgresql-addon)
-* [MySQL](https://git.cloudron.io/cloudron/mysql-addon)
-* [Mongodb](https://git.cloudron.io/cloudron/mongodb-addon)
-* [Mail](https://git.cloudron.io/cloudron/mail-addon)
-
 ## Community

 * [Chat](https://chat.cloudron.io/)
@@ -29,7 +29,7 @@ function create_droplet() {
    local ssh_key_id="$1"
    local box_name="$2"

-    local image_region="sfo1"
+    local image_region="sfo2"
    local ubuntu_image_slug="ubuntu-16-04-x64"
    local box_size="1gb"

@@ -47,10 +47,10 @@ apt-get -y install \
 cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades

 echo "==> Installing node.js"
-mkdir -p /usr/local/node-6.11.3
-curl -sL https://nodejs.org/dist/v6.11.3/node-v6.11.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.3
-ln -sf /usr/local/node-6.11.3/bin/node /usr/bin/node
-ln -sf /usr/local/node-6.11.3/bin/npm /usr/bin/npm
+mkdir -p /usr/local/node-8.9.3
+curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
+ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
+ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
 apt-get install -y python   # Install python which is required for npm rebuild
 [[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x"

@@ -61,7 +61,7 @@ echo "==> Installing Docker"
 mkdir -p /etc/systemd/system/docker.service.d
 echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=overlay2" > /etc/systemd/system/docker.service.d/cloudron.conf

-curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.03.1~ce-0~ubuntu-xenial_amd64.deb -o /tmp/docker.deb
+curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
 # apt install with install deps (as opposed to dpkg -i)
 apt install -y /tmp/docker.deb
 rm /tmp/docker.deb
@@ -2,6 +2,8 @@

 'use strict';

+var database = require('./src/database.js');
+
 var sendFailureLogs = require('./src/logcollector').sendFailureLogs;

 function main() {
@@ -10,7 +12,12 @@ function main() {
    var processName = process.argv[2];
    console.log('Started crash notifier for', processName);

-    sendFailureLogs(processName, { unit: processName });
+    // mailer needs the db
+    database.initialize(function (error) {
+        if (error) return console.error('Cannot connect to database. Unable to send crash log.', error);
+
+        sendFailureLogs(processName, { unit: processName });
+    });
 }

 main();
@@ -1,204 +0,0 @@
-/* jslint node:true */
-
-'use strict';
-
-var argv = require('yargs').argv,
-    autoprefixer = require('gulp-autoprefixer'),
-    concat = require('gulp-concat'),
-    cssnano = require('gulp-cssnano'),
-    del = require('del'),
-    ejs = require('gulp-ejs'),
-    gulp = require('gulp'),
-    sass = require('gulp-sass'),
-    serve = require('gulp-serve'),
-    sourcemaps = require('gulp-sourcemaps'),
-    uglify = require('gulp-uglify'),
-    url = require('url');
-
-gulp.task('3rdparty', function () {
-    gulp.src([
-        'webadmin/src/3rdparty/**/*.js',
-        'webadmin/src/3rdparty/**/*.map',
-        'webadmin/src/3rdparty/**/*.css',
-        'webadmin/src/3rdparty/**/*.otf',
-        'webadmin/src/3rdparty/**/*.eot',
-        'webadmin/src/3rdparty/**/*.svg',
-        'webadmin/src/3rdparty/**/*.gif',
-        'webadmin/src/3rdparty/**/*.ttf',
-        'webadmin/src/3rdparty/**/*.woff',
-        'webadmin/src/3rdparty/**/*.woff2'
-        ])
-        .pipe(gulp.dest('webadmin/dist/3rdparty/'))
-        .pipe(gulp.dest('setup/splash/website/3rdparty'));
-
-    gulp.src('node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js')
-        .pipe(gulp.dest('webadmin/dist/3rdparty/js'))
-        .pipe(gulp.dest('setup/splash/website/3rdparty/js'));
-});
-
-
-// --------------
-// JavaScript
-// --------------
-
-if (argv.help || argv.h) {
-    console.log('Supported arguments for "gulp develop":');
-    console.log(' --client-id <clientId>');
-    console.log(' --client-secret <clientSecret>');
-    console.log(' --api-origin <cloudron api uri>');
-
-    process.exit(1);
-}
-
-gulp.task('js', ['js-index', 'js-setup', 'js-setupdns', 'js-update'], function () {});
-
-var oauth = {
-    clientId: argv.clientId || 'cid-webadmin',
-    clientSecret: argv.clientSecret || 'unused',
-    apiOrigin: argv.apiOrigin || '',
-    apiOriginHostname: argv.apiOrigin ? url.parse(argv.apiOrigin).hostname : ''
-};
-
-console.log();
-console.log('Using OAuth credentials:');
-console.log(' ClientId:      %s', oauth.clientId);
-console.log(' ClientSecret:  %s', oauth.clientSecret);
-console.log(' Cloudron API:  %s', oauth.apiOrigin || 'default');
-console.log(' Cloudron Host: %s', oauth.apiOriginHostname);
-console.log();
-
-
-gulp.task('js-index', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src([
-        'webadmin/src/js/index.js',
-        'webadmin/src/js/client.js',
-        'webadmin/src/js/appstore.js',
-        'webadmin/src/js/main.js',
-        'webadmin/src/views/*.js'
-        ])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
-        .pipe(sourcemaps.init())
-        .pipe(concat('index.js', { newLine: ';' }))
-        .pipe(uglifyer)
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
-});
-
-gulp.task('js-setup', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
-        .pipe(sourcemaps.init())
-        .pipe(concat('setup.js', { newLine: ';' }))
-        .pipe(uglifyer)
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
-});
-
-gulp.task('js-setupdns', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
-        .pipe(sourcemaps.init())
-        .pipe(concat('setupdns.js', { newLine: ';' }))
-        .pipe(uglifyer)
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
-});
-
-gulp.task('js-update', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/update.js'])
-        .pipe(sourcemaps.init())
-        .pipe(uglifyer)
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'))
-        .pipe(gulp.dest('setup/splash/website/js'));
-});
-
-
-// --------------
-// HTML
-// --------------
-
-gulp.task('html', ['html-views', 'html-update', 'html-templates'], function () {
-    return gulp.src('webadmin/src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname }, { ext: '.html' })).pipe(gulp.dest('webadmin/dist'));
-});
-
-gulp.task('html-update', function () {
-    return gulp.src(['webadmin/src/update.html']).pipe(gulp.dest('setup/splash/website'));
-});
-
-gulp.task('html-views', function () {
-    return gulp.src('webadmin/src/views/**/*.html').pipe(gulp.dest('webadmin/dist/views'));
-});
-
-gulp.task('html-templates', function () {
-    return gulp.src('webadmin/src/templates/**/*.html').pipe(gulp.dest('webadmin/dist/templates'));
-});
-
-// --------------
-// CSS
-// --------------
-
-gulp.task('css', function () {
-    return gulp.src('webadmin/src/*.scss')
-        .pipe(sourcemaps.init())
-        .pipe(sass({ includePaths: ['node_modules/bootstrap-sass/assets/stylesheets/'] }).on('error', sass.logError))
-        .pipe(autoprefixer())
-        .pipe(cssnano())
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist'))
-        .pipe(gulp.dest('setup/splash/website'));
-});
-
-gulp.task('images', function () {
-    return gulp.src('webadmin/src/img/**')
-        .pipe(gulp.dest('webadmin/dist/img'));
-});
-
-// --------------
-// Utilities
-// --------------
-
-gulp.task('watch', ['default'], function () {
-    gulp.watch(['webadmin/src/*.scss'], ['css']);
-    gulp.watch(['webadmin/src/img/*'], ['images']);
-    gulp.watch(['webadmin/src/**/*.html'], ['html']);
-    gulp.watch(['webadmin/src/views/*.html'], ['html-views']);
-    gulp.watch(['webadmin/src/templates/*.html'], ['html-templates']);
-    gulp.watch(['webadmin/src/js/update.js'], ['js-update']);
-    gulp.watch(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'], ['js-setup']);
-    gulp.watch(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'], ['js-setupdns']);
-    gulp.watch(['webadmin/src/js/index.js', 'webadmin/src/js/client.js', 'webadmin/src/js/appstore.js', 'webadmin/src/js/main.js', 'webadmin/src/views/*.js'], ['js-index']);
-    gulp.watch(['webadmin/src/3rdparty/**/*'], ['3rdparty']);
-});
-
-gulp.task('clean', function () {
-    del.sync(['webadmin/dist', 'setup/splash/website']);
-});
-
-gulp.task('default', ['clean', 'html', 'js', '3rdparty', 'images', 'css'], function () {});
-
-gulp.task('develop', ['watch'], serve({ root: 'webadmin/dist', port: 4000 }));
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-var tar = require('tar-fs'),
-    fs = require('fs'),
-    path = require('path'),
-    zlib = require('zlib');
-
-if (process.argv.length < 4) {
-    console.error('Usage: tarjs <cwd> <dir>');
-    process.exit(1);
-}
-
-var dir = process.argv[3];
-var cwd = process.argv[2];
-
-console.error('Packing directory "'+ dir +'" from within "' + cwd + '" and stream to stdout');
-
-process.chdir(cwd);
-
-var stat = fs.statSync(dir);
-if (!stat.isDirectory()) throw(dir + ' is not a directory');
-
-var gzipStream = zlib.createGzip({});
-
-tar.pack(path.resolve(dir), {
-    ignore: function (name) {
-        if (name === '.') return true;
-        return false;
-    }
-}).pipe(gzipStream).pipe(process.stdout);
@@ -2,7 +2,7 @@

 var async = require('async');

-var ADMIN_GROUP_ID = 'admin'; // see groups.js
+var ADMIN_GROUP_ID = 'admin'; // see constants.js

 exports.up = function(db, callback) {
 	async.series([
@@ -0,0 +1,40 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE backups ADD COLUMN manifestJson TEXT'),
+
+        db.runSql.bind(db, 'START TRANSACTION;'),
+
+        // fill all the backups with restoreConfigs from current apps
+        function addManifests(callback) {
+            console.log('Importing manifests');
+
+            db.all('SELECT * FROM backups WHERE type="app"', function (error, backups) {
+                if (error) return callback(error);
+
+                async.eachSeries(backups, function (backup, next) {
+                    var m = backup.restoreConfigJson ? JSON.parse(backup.restoreConfigJson) : null;
+                    if (m) m = JSON.stringify(m.manifest);
+
+                    db.runSql('UPDATE backups SET manifestJson=? WHERE id=?', [ m, backup.id ], next);
+                }, callback);
+            });
+        },
+
+        db.runSql.bind(db, 'COMMIT'),
+
+        // remove the restoreConfig
+        db.runSql.bind(db, 'ALTER TABLE backups DROP COLUMN restoreConfigJson')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE backups DROP COLUMN manifestJson'),
+        db.runSql.bind(db, 'ALTER TABLE backups ADD COLUMN restoreConfigJson TEXT'),
+    ], callback);
+};
+
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE newConfigJson updateConfigJson TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE updateConfigJson newConfigJson TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE lastBackupId restoreConfigJson TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE restoreConfigJson lastBackupId TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,31 @@
+'use strict';
+
+// WARNING!!
+// At this point the default db collation is utf8mb4_unicode_ci however we already have foreign key constraits
+// already with tables on utf8_bin charset, so we cannot convert all tables here to utf8mb4 collation without
+// a reimport from a sql dump, as foreign keys across different collations are not supported
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE appPortBindings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE apps CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE authcodes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE backups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE clients CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE eventlog CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE groupMembers CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE groups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE mailboxes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE migrations CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE settings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE tokens CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE users CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    // nothing to be done here
+    callback();
+};
@@ -0,0 +1,70 @@
+'use strict';
+
+var async = require('async'),
+    safe = require('safetydance');
+
+exports.up = function(db, callback) {
+    // first check precondtion of domain entry in settings
+    db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
+        if (error) return callback(error);
+
+        var domain = {};
+        if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
+
+        async.series([
+            db.runSql.bind(db, 'START TRANSACTION;'),
+            function addAppsDomainColumn(done) {
+                db.runSql('ALTER TABLE apps ADD COLUMN domain VARCHAR(128)', [], done);
+            },
+            function setAppDomain(done) {
+                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
+                db.runSql('UPDATE apps SET domain = ?', [ domain.fqdn ], done);
+            },
+            function addAppsLocationDomainUniqueConstraint(done) {
+                db.runSql('ALTER TABLE apps ADD UNIQUE location_domain_unique_index (location, domain)', [], done);
+            },
+            function removePresetupAdminGroupIfNew(done) {
+                // do not delete on update, will update the record in setMailboxesDomain()
+                if (domain.fqdn) return done();
+
+                // this will be finally created once we have a domain when we create the owner in user.js
+                const ADMIN_GROUP_ID = 'admin'; // see constants.js
+                db.runSql('DELETE FROM groups WHERE id = ?', [ ADMIN_GROUP_ID ], function (error) {
+                    if (error) return done(error);
+
+                    db.runSql('DELETE FROM mailboxes WHERE ownerId = ?', [ ADMIN_GROUP_ID ], done);
+                });
+            },
+            function addMailboxesDomainColumn(done) {
+                db.runSql('ALTER TABLE mailboxes ADD COLUMN domain VARCHAR(128)', [], done);
+            },
+            function setMailboxesDomain(done) {
+                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
+                db.runSql('UPDATE mailboxes SET domain = ?', [ domain.fqdn ], done);
+            },
+            function dropAppsLocationUniqueConstraint(done) {
+                db.runSql('ALTER TABLE apps DROP INDEX location', [], done);
+            },
+            db.runSql.bind(db, 'COMMIT')
+        ], callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'START TRANSACTION;'),
+        function dropMailboxesDomainColumn(done) {
+            db.runSql('ALTER TABLE mailboxes DROP COLUMN domain', [], done);
+        },
+        function dropLocationDomainUniqueConstraint(done) {
+            db.runSql('ALTER TABLE apps DROP INDEX location_domain_unique_index', [], done);
+        },
+        function dropAppsDomainColumn(done) {
+            db.runSql('ALTER TABLE apps DROP COLUMN domain', [], done);
+        },
+        function addAppsLocationUniqueConstraint(done) {
+            db.runSql('ALTER TABLE apps ADD UNIQUE location (location)', [], done);
+        },
+        db.runSql.bind(db, 'COMMIT')
+    ], callback);
+};
@@ -0,0 +1,61 @@
+'use strict';
+
+var async = require('async'),
+    safe = require('safetydance'),
+    tld = require('tldjs');
+
+exports.up = function(db, callback) {
+    var fqdn, zoneName, configJson;
+
+    async.series([
+        function gatherDomain(done) {
+            db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
+                if (error) return done(error);
+
+                var domain = {};
+                if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
+
+                fqdn = domain.fqdn || ''; // will be null pre-setup
+                zoneName = domain.zoneName || tld.getDomain(fqdn) || fqdn;
+
+                done();
+            });
+        },
+        function gatherDNSConfig(done) {
+            db.all('SELECT * FROM settings WHERE name = ?', [ 'dns_config' ], function (error, result) {
+                if (error) return done(error);
+
+                configJson = (result[0] && result[0].value) ? result[0].value : JSON.stringify({ provider: 'manual'});
+
+                // caas dns config needs an fqdn
+                var config = JSON.parse(configJson);
+                if (config.provider === 'caas') config.fqdn = fqdn;
+                configJson = JSON.stringify(config);
+
+                done();
+            });
+        },
+        db.runSql.bind(db, 'START TRANSACTION;'),
+        function createDomainsTable(done) {
+            var cmd = `
+                CREATE TABLE domains(
+                domain VARCHAR(128) NOT NULL UNIQUE,
+                zoneName VARCHAR(128) NOT NULL,
+                configJson TEXT,
+                PRIMARY KEY (domain)) CHARACTER SET utf8 COLLATE utf8_bin
+            `;
+
+            db.runSql(cmd, [], done);
+        },
+        function addInitialDomain(done) {
+            if (!fqdn) return done();
+
+            db.runSql('INSERT INTO domains (domain, zoneName, configJson) VALUES (?, ?, ?)', [ fqdn, zoneName, configJson ], done);
+        },
+        db.runSql.bind(db, 'COMMIT')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DROP TABLE domains', callback);
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps ADD CONSTRAINT apps_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP FOREIGN KEY apps_domain_constraint', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD CONSTRAINT mailboxes_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP FOREIGN KEY mailboxes_domain_constraint', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP PRIMARY KEY', function (error) {
+      if (error) console.error(error);
+      callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD PRIMARY KEY(name)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD UNIQUE mailboxes_name_domain_unique_index (name, domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP INDEX mailboxes_name_domain_unique_index', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps ADD COLUMN updateTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP COLUMN updateTime', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE createdAt creationTime TIMESTAMP(2) NOT NULL', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE creationTime createdAt TIMESTAMP(2) NOT NULL', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,28 @@
+'use strict';
+
+var async = require('async');
+
+// NOTE: This migration is incorrect because 'caas' domain is not guaranteed to be present in all Caas cloudrons
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM domains', function (error, domains) {
+        if (error) return callback(error);
+
+        var caasDomains = domains.filter(function (d) { return JSON.parse(d.configJson).provider === 'caas'; });
+        if (caasDomains.length === 0) return callback();
+        var caasDomain = caasDomains[0].domain;
+
+        db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, settings) {
+            if (error) return callback(error);
+
+            var setting = settings[0];
+            var config = JSON.parse(setting.value);
+            config.fqdn = caasDomain;
+
+            db.runSql('UPDATE settings SET value=? WHERE name=?', [ JSON.stringify(config), setting.name ], callback);
+        });
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};
@@ -0,0 +1,23 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    var backupConfig = {
+        "provider": "filesystem",
+        "backupFolder": "/var/backups",
+        "format": "tgz",
+        "retentionSecs": 172800
+    };
+
+    db.runSql('INSERT settings (name, value) VALUES(?, ?)', [ 'backup_config', JSON.stringify(backupConfig) ], function (error) {
+        if (!error || error.code === 'ER_DUP_ENTRY') return callback(); // dup entry is OK for existing cloudrons
+
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DELETE FROM settings WHERE name=?', ['backup_config'], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,33 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    // first check precondtion of domain entry in settings
+    db.all('SELECT * FROM domains', [ ], function (error, domains) {
+        if (error) return callback(error);
+
+        async.series([
+            db.runSql.bind(db, 'START TRANSACTION;'),
+            db.runSql.bind(db, 'ALTER TABLE domains ADD COLUMN provider VARCHAR(16) DEFAULT ""'),
+            function setProvider(done) {
+                async.eachSeries(domains, function (domain, iteratorCallback) {
+                    var config = JSON.parse(domain.configJson);
+                    var provider = config.provider;
+                    delete config.provider;
+
+                    db.runSql('UPDATE domains SET provider = ?, configJson = ? WHERE domain = ?', [ provider, JSON.stringify(config), domain.domain ], iteratorCallback);
+                }, done);
+            },
+            db.runSql.bind(db, 'ALTER TABLE domains MODIFY provider VARCHAR(16) NOT NULL'),
+            db.runSql.bind(db, 'COMMIT')
+        ], callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE domains DROP COLUMN provider', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,24 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    var cmd = 'CREATE TABLE IF NOT EXISTS mail(' +
+                'domain VARCHAR(128) NOT NULL UNIQUE,' +
+                'enabled BOOLEAN DEFAULT 0,' +
+                'mailFromValidation BOOLEAN DEFAULT 1,' +
+                'catchAllJson TEXT,' +
+                'relayJson TEXT,' +
+                'FOREIGN KEY(domain) REFERENCES domains(domain),' +
+                'PRIMARY KEY(domain)) CHARACTER SET utf8 COLLATE utf8_bin';
+
+    db.runSql(cmd, function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DROP TABLE mail', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,34 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM domains', function (error, domains) {
+        if (error) return callback(error);
+        if (domains.length === 0) return callback();
+
+        db.all('SELECT * FROM settings', function (error, allSettings) {
+            if (error) return callback(error);
+
+            // defaults
+            var mailFromValidation = true;
+            var catchAll = [ ];
+            var relay = { provider: 'cloudron-smtp' };
+            var mailEnabled = false;
+
+            allSettings.forEach(function (setting) {
+                switch (setting.name) {
+                case 'mail_from_validation': mailFromValidation = !!setting.value; break;
+                case 'catch_all_address': catchAll = JSON.parse(setting.value); break;
+                case 'mail_relay': relay = JSON.parse(setting.value); break;
+                case 'mail_config': mailEnabled = JSON.parse(setting.value).enabled; break;
+                }
+            });
+
+            db.runSql('INSERT INTO mail (domain, enabled, mailFromValidation, catchAllJson, relayJson) VALUES (?, ?, ?, ?, ?)',
+                [ domains[0].domain, mailEnabled, mailFromValidation, JSON.stringify(catchAll), JSON.stringify(relay) ], callback);
+        });
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};
@@ -0,0 +1,44 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM users', [ ], function (error, users) {
+        if (error) return callback(error);
+
+        db.all('SELECT * FROM mail WHERE enabled=1', [ ], function (error, mailDomains) {
+            if (error) return callback(error);
+
+            async.series([
+                db.runSql.bind(db, 'START TRANSACTION;'),
+                db.runSql.bind(db, 'ALTER TABLE users DROP INDEX users_email'),
+                db.runSql.bind(db, 'ALTER TABLE users ADD COLUMN fallbackEmail VARCHAR(512) DEFAULT ""'),
+                function setDefaults(done) {
+                    async.eachSeries(users, function (user, iteratorCallback) {
+                        var defaultEmail = '';
+                        var fallbackEmail = '';
+
+                        if (mailDomains.length === 0) {
+                            defaultEmail = user.email;
+                            fallbackEmail = user.email;
+                        } else {
+                            defaultEmail = user.username ? (user.username + '@' + mailDomains[0].domain) : user.email;
+                            fallbackEmail = user.email;
+                        }
+
+                        db.runSql('UPDATE users SET email = ?, fallbackEmail = ? WHERE id = ?', [ defaultEmail, fallbackEmail, user.id ], iteratorCallback);
+                    }, done);
+                },
+                db.runSql.bind(db, 'ALTER TABLE users ADD UNIQUE users_email (email)'),
+                db.runSql.bind(db, 'COMMIT')
+            ], callback);
+        });
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE users DROP COLUMN fallbackEmail', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,26 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM settings WHERE name = ?', [ 'tls_config' ], function (error, result) {
+        if (error) return callback(error);
+
+        var tlsConfig = (result[0] && result[0].value) ? JSON.parse(result[0].value) : { provider: 'letsencrypt-prod'};
+        tlsConfig.provider = tlsConfig.provider.replace(/$le\-/, 'letsencrypt-'); // old cloudrons had le-prod/le-staging
+
+        async.series([
+            db.runSql.bind(db, 'START TRANSACTION;'),
+            db.runSql.bind(db, 'ALTER TABLE domains ADD COLUMN tlsConfigJson TEXT'),
+            db.runSql.bind(db, 'UPDATE domains SET tlsConfigJson = ?', [ JSON.stringify(tlsConfig) ]),
+            db.runSql.bind(db, 'COMMIT')
+        ], callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE domains DROP COLUMN tlsConfigJson', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
@@ -0,0 +1,47 @@
+'use strict';
+
+var async = require('async'),
+    fs = require('fs'),
+    superagent = require('superagent');
+
+exports.up = function(db, callback) {
+    if (!fs.existsSync('/home/yellowtent/configs/cloudron.conf')) {
+        console.log('Unable to locate cloudron.conf');
+        return callback();
+    }
+
+    var config = JSON.parse(fs.readFileSync('/home/yellowtent/configs/cloudron.conf', 'utf8'));
+
+    if (config.provider !== 'caas' || !config.fqdn) {
+        console.log('Not caas (%s) or no fqdn', config.provider, config.fqdn);
+        return callback();
+    }
+
+    db.runSql('SELECT COUNT(*) AS total FROM users', function (error, result) {
+        if (error) return callback(error);
+
+        if (result[0].total === 0) {
+            console.log('This cloudron is not activated. It will automatically get appstore and caas configs from autoprovision logic');
+            return callback();
+        }
+
+        console.log('Downloading appstore and caas config');
+
+        superagent.get(config.apiServerOrigin + `/api/v1/boxes/${config.fqdn}/config`)
+            .query({ token: config.token })
+            .timeout(30 * 1000).end(function (error, result) {
+                if (error) return callback(error);
+
+                console.log('Adding %j config', result.body);
+
+                async.series([
+                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'appstore_config', JSON.stringify(result.body.appstoreConfig) ]),
+                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'caas_config', JSON.stringify(result.body.caasConfig) ])
+                ], callback);
+            });
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};
@@ -9,6 +9,10 @@
 #### BLOB - stored offline from table row (use for binary data)
 #### https://dev.mysql.com/doc/refman/5.0/en/storage-requirements.html

+# The code uses zero dates. Make sure sql_mode does NOT have NO_ZERO_DATE
+# http://johnemb.blogspot.com/2014/09/adding-or-removing-individual-sql-modes.html
+# SET GLOBAL sql_mode=(SELECT REPLACE(@@sql_mode,'NO_ZERO_DATE',''));
+
 CREATE TABLE IF NOT EXISTS users(
    id VARCHAR(128) NOT NULL UNIQUE,
    username VARCHAR(254) UNIQUE,
@@ -19,6 +23,8 @@ CREATE TABLE IF NOT EXISTS users(
    modifiedAt VARCHAR(512) NOT NULL,
    admin INTEGER NOT NULL,
    displayName VARCHAR(512) DEFAULT '',
+    fallbackEmail VARCHAR(512) DEFAULT ""
+
    PRIMARY KEY(id));

 CREATE TABLE IF NOT EXISTS groups(
@@ -59,23 +65,26 @@ CREATE TABLE IF NOT EXISTS apps(
    containerId VARCHAR(128),
    manifestJson TEXT,
    httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
-    location VARCHAR(128) NOT NULL UNIQUE,
+    location VARCHAR(128) NOT NULL,
+    domain VARCHAR(128) NOT NULL,
    dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates
    accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
    createdAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
    memoryLimit BIGINT DEFAULT 0,
    altDomain VARCHAR(256),
    xFrameOptions VARCHAR(512),
    sso BOOLEAN DEFAULT 1, // whether user chose to enable SSO
    debugModeJson TEXT, // options for development mode
    robotsTxt TEXT,
-    enableBackup BOOLEAN DEFAULT 1,
+    enableBackup BOOLEAN DEFAULT 1, // misnomer: controls automatic daily backups

    // the following fields do not belong here, they can be removed when we use a queue for apptask
-    lastBackupId VARCHAR(128), // used to pass backupId to restore from to apptask
+    restoreConfigJson VARCHAR(256), // used to pass backupId to restore from to apptask
    oldConfigJson TEXT, // used to pass old config for apptask (configure, restore)
-    newConfigJson TEXT, // used to pass new config for apptask (update)
+    updateConfigJson TEXT, // used to pass new config for apptask (update)

+    FOREIGN KEY(domain) REFERENCES domains(domain),
    PRIMARY KEY(id));

 CREATE TABLE IF NOT EXISTS appPortBindings(
@@ -111,7 +120,7 @@ CREATE TABLE IF NOT EXISTS backups(
    type VARCHAR(16) NOT NULL, /* 'box' or 'app' */
    dependsOn TEXT, /* comma separate list of objects this backup depends on */
    state VARCHAR(16) NOT NULL,
-    restoreConfigJson TEXT, /* JSON including the manifest of the backed up app */
+    manifestJson TEXT, /* to validate if the app can be installed in this version of box */
    format VARCHAR(16) DEFAULT "tgz",

    PRIMARY KEY (id));
@@ -135,5 +144,34 @@ CREATE TABLE IF NOT EXISTS mailboxes(
    ownerType VARCHAR(16) NOT NULL, /* 'app' or 'user' or 'group' */
    aliasTarget VARCHAR(128), /* the target name type is an alias */
    creationTime TIMESTAMP,
+    domain VARCHAR(128),
+
+    FOREIGN KEY(domain) REFERENCES domains(domain),
+    UNIQUE (name, domain));
+
+CREATE TABLE IF NOT EXISTS domains(
+    domain VARCHAR(128) NOT NULL UNIQUE, /* if this needs to be larger, InnoDB has a limit of 767 bytes for PRIMARY KEY values! */
+    zoneName VARCHAR(128) NOT NULL, /* this mostly contains the domain itself again */
+    provider VARCHAR(16) NOT NULL,
+    configJson TEXT, /* JSON containing the dns backend provider config */
+    tlsConfigJson TEXT, /* JSON containing the tls provider config */
+
+    PRIMARY KEY (domain))
+
+    /* the default db collation is utf8mb4_unicode_ci but for the app table domain constraint we have to use the old one */
+    CHARACTER SET utf8 COLLATE utf8_bin;
+
+CREATE TABLE IF NOT EXISTS mail(
+    domain VARCHAR(128) NOT NULL UNIQUE,
+
+    enabled BOOLEAN DEFAULT 0, /* MDA enabled */
+    mailFromValidation BOOLEAN DEFAULT 1,
+    catchAllJson TEXT,
+    relayJson TEXT,
+
+    FOREIGN KEY(domain) REFERENCES domains(domain),
+    PRIMARY KEY(domain))
+
+    CHARACTER SET utf8 COLLATE utf8_bin;
+

-    PRIMARY KEY (name));
@@ -14,95 +14,95 @@
    "node": ">=4.0.0 <=4.1.1"
  },
  "dependencies": {
-    "@google-cloud/dns": "^0.6.2",
+    "@google-cloud/dns": "^0.7.0",
+    "@google-cloud/storage": "^1.2.1",
    "@sindresorhus/df": "^2.1.0",
-    "async": "^2.5.0",
-    "aws-sdk": "^2.132.0",
-    "body-parser": "^1.17.2",
-    "cloudron-manifestformat": "^2.9.0",
+    "async": "^2.6.0",
+    "aws-sdk": "^2.151.0",
+    "body-parser": "^1.18.2",
+    "cloudron-manifestformat": "^2.11.0",
    "connect-ensure-login": "^0.1.1",
-    "connect-lastmile": "^0.1.0",
+    "connect-lastmile": "^1.0.2",
    "connect-timeout": "^1.9.0",
    "cookie-parser": "^1.3.5",
-    "cookie-session": "^1.1.0",
-    "cron": "^1.0.9",
+    "cookie-session": "^1.3.2",
+    "cron": "^1.3.0",
    "csurf": "^1.6.6",
-    "db-migrate": "^0.10.0-beta.20",
+    "db-migrate": "^0.10.0-beta.24",
    "db-migrate-mysql": "^1.1.10",
-    "debug": "^3.0.0",
-    "dockerode": "^2.4.3",
+    "debug": "^3.1.0",
+    "dockerode": "^2.5.3",
    "ejs": "^2.5.7",
    "ejs-cli": "^2.0.0",
-    "express": "^4.15.4",
-    "express-session": "^1.15.5",
-    "gulp-sass": "^3.0.0",
+    "express": "^4.16.2",
+    "express-session": "^1.15.6",
    "hat": "0.0.3",
-    "hock": "https://registry.npmjs.org/hock/-/hock-1.3.2.tgz",
    "json": "^9.0.3",
    "ldapjs": "^1.0.0",
    "lodash.chunk": "^4.2.0",
-    "mime": "^1.3.4",
-    "moment-timezone": "^0.5.5",
-    "morgan": "^1.7.0",
+    "mime": "^2.0.3",
+    "moment-timezone": "^0.5.14",
+    "morgan": "^1.9.0",
    "multiparty": "^4.1.2",
-    "mysql": "^2.7.0",
-    "nodemailer": "^4.0.1",
+    "mysql": "^2.15.0",
+    "nodemailer": "^4.4.0",
    "nodemailer-smtp-transport": "^2.7.4",
-    "oauth2orize": "^1.0.1",
+    "oauth2orize": "^1.11.0",
    "once": "^1.3.2",
    "parse-links": "^0.1.0",
-    "passport": "^0.2.2",
-    "passport-http": "^0.2.2",
+    "passport": "^0.4.0",
+    "passport-http": "^0.3.0",
    "passport-http-bearer": "^1.0.1",
    "passport-local": "^1.0.0",
    "passport-oauth2-client-password": "^0.1.2",
-    "password-generator": "^2.0.2",
+    "password-generator": "^2.2.0",
    "progress-stream": "^2.0.0",
-    "proxy-middleware": "^0.13.0",
+    "proxy-middleware": "^0.15.0",
+    "recursive-readdir": "^2.2.1",
+    "request": "^2.83.0",
    "s3-block-read-stream": "^0.2.0",
    "safetydance": "^0.7.1",
-    "semver": "^4.3.6",
-    "showdown": "^1.6.0",
+    "semver": "^5.4.1",
+    "showdown": "^1.8.2",
    "split": "^1.0.0",
-    "superagent": "^3.5.2",
+    "superagent": "^3.8.1",
    "supererror": "^0.7.1",
-    "tar-fs": "^1.15.3",
-    "tldjs": "^1.6.2",
+    "tar-fs": "^1.16.0",
+    "tar-stream": "^1.5.5",
+    "tldjs": "^2.2.0",
    "underscore": "^1.7.0",
    "uuid": "^3.1.0",
    "valid-url": "^1.0.9",
-    "validator": "^4.9.0",
-    "ws": "^2.3.1"
+    "validator": "^9.1.1",
+    "ws": "^3.3.1"
  },
  "devDependencies": {
    "bootstrap-sass": "^3.3.3",
-    "del": "^1.1.1",
    "expect.js": "*",
    "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^2.3.0",
+    "gulp-autoprefixer": "^4.0.0",
    "gulp-concat": "^2.4.3",
    "gulp-cssnano": "^2.1.0",
-    "gulp-ejs": "^1.0.0",
-    "gulp-sass": "^3.0.0",
+    "gulp-ejs": "^3.1.0",
+    "gulp-sass": "^3.1.0",
    "gulp-serve": "^1.0.0",
-    "gulp-sourcemaps": "^1.5.2",
-    "gulp-uglify": "^1.1.0",
-    "hock": "~1.2.0",
+    "gulp-sourcemaps": "^2.6.1",
+    "gulp-uglify": "^3.0.0",
+    "hock": "^1.3.2",
    "istanbul": "*",
-    "js2xmlparser": "^1.0.0",
+    "js2xmlparser": "^3.0.0",
    "mocha": "*",
    "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
    "nock": "^9.0.14",
-    "node-sass": "^3.13.1",
+    "node-sass": "^4.6.1",
    "readdirp": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-    "request": "^2.65.0",
-    "yargs": "^3.15.0"
+    "yargs": "^10.0.3"
  },
  "scripts": {
    "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
    "migrate_test": "BOX_ENV=test DATABASE_URL=mysql://root:@localhost/boxtest node_modules/.bin/db-migrate up",
-    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test/[^a]*",
-    "test_all": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test",
+    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test/[^a]*",
+    "test_all": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test",
    "postmerge": "/bin/true",
    "precommit": "/bin/true",
    "prepush": "npm test",
@@ -44,60 +44,37 @@ fi

 initBaseImage="true"
 # provisioning data
-domain=""
-adminLocation="my"
-zoneName=""
 provider=""
-encryptionKey=""
-restoreUrl=""
-dnsProvider="manual"
-tlsProvider="le-prod"
 requestedVersion=""
 apiServerOrigin="https://api.cloudron.io"
 webServerOrigin="https://cloudron.io"
-dataJson=""
 prerelease="false"
 sourceTarballUrl=""
 rebootServer="true"
 baseDataDir=""

-# TODO this is still there for the restore case, see other occasions below
-versionsUrl="https://s3.amazonaws.com/prod-cloudron-releases/versions.json"
-
-args=$(getopt -o "" -l "domain:,help,skip-baseimage-init,data:,data-dir:,provider:,encryption-key:,restore-url:,tls-provider:,version:,dns-provider:,env:,admin-location:,prerelease,skip-reboot,source-url:" -n "$0" -- "$@")
+args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,version:,env:,prerelease,skip-reboot" -n "$0" -- "$@")
 eval set -- "${args}"

 while true; do
    case "$1" in
-    --domain) domain="$2"; shift 2;;
-    --admin-location) adminLocation="$2"; shift 2;;
    --help) echo "See https://cloudron.io/documentation/installation/ on how to install Cloudron"; exit 0;;
    --provider) provider="$2"; shift 2;;
-    --encryption-key) encryptionKey="$2"; shift 2;;
-    --restore-url) restoreUrl="$2"; shift 2;;
-    --tls-provider) tlsProvider="$2"; shift 2;;
-    --dns-provider) dnsProvider="$2"; shift 2;;
    --version) requestedVersion="$2"; shift 2;;
    --env)
        if [[ "$2" == "dev" ]]; then
-            versionsUrl="https://s3.amazonaws.com/dev-cloudron-releases/versions.json"
            apiServerOrigin="https://api.dev.cloudron.io"
            webServerOrigin="https://dev.cloudron.io"
-            tlsProvider="le-staging"
            prerelease="true"
        elif [[ "$2" == "staging" ]]; then
-            versionsUrl="https://s3.amazonaws.com/staging-cloudron-releases/versions.json"
            apiServerOrigin="https://api.staging.cloudron.io"
            webServerOrigin="https://staging.cloudron.io"
-            tlsProvider="le-staging"
            prerelease="true"
        fi
        shift 2;;
    --skip-baseimage-init) initBaseImage="false"; shift;;
    --skip-reboot) rebootServer="false"; shift;;
-    --data) dataJson="$2"; shift 2;;
    --prerelease) prerelease="true"; shift;;
-    --source-url) sourceTarballUrl="$2"; version="0.0.1+custom"; shift 2;;
    --data-dir) baseDataDir=$(realpath "$2"); shift 2;;
    --) break;;
    *) echo "Unknown option $1"; exit 1;;
@@ -105,47 +82,33 @@ while true; do
 done

 # validate arguments in the absence of data
-if [[ -z "${dataJson}" ]]; then
-    if [[ -z "${provider}" ]]; then
-        echo "--provider is required (azure, cloudscale.ch, digitalocean, ec2, exoscale, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
-        exit 1
-    elif [[  \
-                "${provider}" != "ami" && \
-                "${provider}" != "azure" && \
-                "${provider}" != "cloudscale.ch" && \
-                "${provider}" != "digitalocean" && \
-                "${provider}" != "ec2" && \
-                "${provider}" != "exoscale" && \
-                "${provider}" != "gce" && \
-                "${provider}" != "lightsail" && \
-                "${provider}" != "linode" && \
-                "${provider}" != "ovh" && \
-                "${provider}" != "rosehosting" && \
-                "${provider}" != "scaleway" && \
-                "${provider}" != "vultr" && \
-                "${provider}" != "generic" \
-            ]]; then
-        echo "--provider must be one of: azure, cloudscale.ch, digitalocean, ec2, exoscale, gce, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic"
-        exit 1
-    fi
+if [[ -z "${provider}" ]]; then
+    echo "--provider is required (azure, cloudscale, digitalocean, ec2, exoscale, hetzner, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
+    exit 1
+elif [[  \
+            "${provider}" != "ami" && \
+            "${provider}" != "azure" && \
+            "${provider}" != "cloudscale" && \
+            "${provider}" != "digitalocean" && \
+            "${provider}" != "ec2" && \
+            "${provider}" != "exoscale" && \
+            "${provider}" != "gce" && \
+            "${provider}" != "hetzner" && \
+            "${provider}" != "lightsail" && \
+            "${provider}" != "linode" && \
+            "${provider}" != "ovh" && \
+            "${provider}" != "rosehosting" && \
+            "${provider}" != "scaleway" && \
+            "${provider}" != "vultr" && \
+            "${provider}" != "generic" \
+        ]]; then
+    echo "--provider must be one of: azure, cloudscale.ch, digitalocean, ec2, exoscale, gce, hetzner, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic"
+    exit 1
+fi

-    if [[ "${tlsProvider}" != "fallback" && "${tlsProvider}" != "le-prod" && "${tlsProvider}" != "le-staging" ]]; then
-        echo "--tls-provider must be one of: le-prod, le-staging, fallback"
-        exit 1
-    fi
-
-    if [[ -z "${dnsProvider}" ]]; then
-        echo "--dns-provider is required (noop, manual)"
-        exit 1
-    elif [[ "${dnsProvider}" != "noop" && "${dnsProvider}" != "manual" ]]; then
-        echo "--dns-provider must be one of : manual, noop"
-        exit 1
-    fi
-
-    if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
-        echo "${baseDataDir} does not exist"
-        exit 1
-    fi
+if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
+    echo "${baseDataDir} does not exist"
+    exit 1
 fi

 echo ""
@@ -173,76 +136,33 @@ if [[ "${initBaseImage}" == "true" ]]; then
 fi

 echo "=> Checking version"
-if [[ "${sourceTarballUrl}" == "" ]]; then
-    if ! releaseJson=$($curl -s "${apiServerOrigin}/api/v1/releases?prerelease=${prerelease}&boxVersion=${requestedVersion}"); then
-        echo "Failed to get release information"
-        exit 1
-    fi
+if ! releaseJson=$($curl -s "${apiServerOrigin}/api/v1/releases?prerelease=${prerelease}&boxVersion=${requestedVersion}"); then
+    echo "Failed to get release information"
+    exit 1
+fi

-    if [[ "$requestedVersion" == "" ]]; then
-        version=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["version"])')
-    else
-        version="${requestedVersion}"
-    fi
+if [[ "$requestedVersion" == "" ]]; then
+    version=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["version"])')
+else
+    version="${requestedVersion}"
+fi

-    if ! sourceTarballUrl=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["info"]["sourceTarballUrl"])'); then
-        echo "No source code for version '${requestedVersion:-latest}'"
-        exit 1
-    fi
+if ! sourceTarballUrl=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["info"]["sourceTarballUrl"])'); then
+    echo "No source code for version '${requestedVersion:-latest}'"
+    exit 1
 fi

 # Build data
-# TODO versionsUrl is still there for the cloudron restore case
-if [[ -z "${dataJson}" ]]; then
-    if [[ -z "${restoreUrl}" ]]; then
-        data=$(cat <<EOF
-    {
-        "boxVersionsUrl": "${versionsUrl}",
-        "fqdn": "${domain}",
-        "adminLocation": "${adminLocation}",
-        "zoneName": "${zoneName}",
-        "provider": "${provider}",
-        "apiServerOrigin": "${apiServerOrigin}",
-        "webServerOrigin": "${webServerOrigin}",
-        "tlsConfig": {
-            "provider": "${tlsProvider}"
-        },
-        "dnsConfig": {
-            "provider": "${dnsProvider}"
-        },
-        "backupConfig" : {
-            "provider": "filesystem",
-            "backupFolder": "/var/backups",
-            "key": "${encryptionKey}",
-            "format": "tgz",
-            "retentionSecs": 172800
-        },
-        "version": "${version}"
-    }
+# from 1.9, we use autoprovision.json
+data=$(cat <<EOF
+{
+    "provider": "${provider}",
+    "apiServerOrigin": "${apiServerOrigin}",
+    "webServerOrigin": "${webServerOrigin}",
+    "version": "${version}"
+}
 EOF
-    )
-    else
-        data=$(cat <<EOF
-    {
-        "boxVersionsUrl": "${versionsUrl}",
-        "fqdn": "${domain}",
-        "adminLocation": "${adminLocation}",
-        "zoneName": "${zoneName}",
-        "provider": "${provider}",
-        "apiServerOrigin": "${apiServerOrigin}",
-        "webServerOrigin": "${webServerOrigin}",
-        "restore": {
-            "url": "${restoreUrl}",
-            "key": "${encryptionKey}"
-        },
-        "version": "${version}"
-    }
-EOF
-    )
-    fi
-else
-    data="${dataJson}"
-fi
+)

 echo "=> Downloading version ${version} ..."
 box_src_tmp_dir=$(mktemp -dt box-src-XXXXXX)
@@ -263,17 +183,9 @@ fi

 echo "=> Installing version ${version} (this takes some time) ..."
 echo "${data}" > "${DATA_FILE}"
-# poor mans semver
-if [[ ${version} == "0.10"* ]]; then
-    if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" &>> "${LOG_FILE}"; then
-        echo "Failed to install cloudron. See ${LOG_FILE} for details"
-        exit 1
-    fi
-else
-    if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" --data-dir "${baseDataDir}" &>> "${LOG_FILE}"; then
-        echo "Failed to install cloudron. See ${LOG_FILE} for details"
-        exit 1
-    fi
+if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" --data-dir "${baseDataDir}" &>> "${LOG_FILE}"; then
+    echo "Failed to install cloudron. See ${LOG_FILE} for details"
+    exit 1
 fi
 rm "${DATA_FILE}"

@@ -281,17 +193,12 @@ echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
 while true; do
    echo -n "."
    if status=$($curl -q -f "http://localhost:3000/api/v1/cloudron/status" 2>/dev/null); then
-        [[ -z "$domain" ]] && break # with no domain, we are up and running
-        [[ "$status" == *"\"tls\": true"* ]] && break # with a domain, wait for the cert
+        break # we are up and running
    fi
    sleep 10
 done

-if [[ -n "${domain}" ]]; then
-    echo -e "\n\nVisit https://my.${domain} to finish setup once the server has rebooted.\n"
-else
-    echo -e "\n\nVisit https://<IP> to finish setup once the server has rebooted.\n"
-fi
+echo -e "\n\nVisit https://<IP> to finish setup once the server has rebooted.\n"

 if [[ "${rebootServer}" == "true" ]]; then
    echo -e "\n\nRebooting this server now to let bootloader changes take effect.\n"
@@ -7,17 +7,15 @@ set -eu
 [[ $(uname -s) == "Darwin" ]] && GNU_GETOPT="/usr/local/opt/gnu-getopt/bin/getopt" || GNU_GETOPT="getopt"
 readonly GNU_GETOPT

-args=$(${GNU_GETOPT} -o "" -l "revision:,output:" -n "$0" -- "$@")
+args=$(${GNU_GETOPT} -o "" -l "output:" -n "$0" -- "$@")
 eval set -- "${args}"

 readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"

-commitish="HEAD"
 bundle_file=""

 while true; do
    case "$1" in
-    --revision) commitish="$2"; shift 2;;
    --output) bundle_file="$2"; shift 2;;
    --) break;;
    *) echo "Unknown option $1"; exit 1;;
@@ -27,24 +25,33 @@ done
 readonly TMPDIR=${TMPDIR:-/tmp} # why is this not set on mint?

 if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
-    echo "You have local changes, stash or commit them to proceed"
+    echo "You have local changes in box, stash or commit them to proceed"
    exit 1
 fi

-if [[ "$(node --version)" != "v6.11.3" ]]; then
-    echo "This script requires node 6.11.3"
+if ! $(cd "${SOURCE_DIR}/../webadmin" && git diff --exit-code >/dev/null); then
+    echo "You have local changes in webadmin, stash or commit them to proceed"
    exit 1
 fi

-version=$(cd "${SOURCE_DIR}" && git rev-parse "${commitish}")
+if [[ "$(node --version)" != "v8.9.3" ]]; then
+    echo "This script requires node 8.9.3"
+    exit 1
+fi
+
+box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
+branch=$(git rev-parse --abbrev-ref HEAD)
+webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && git fetch && git rev-parse "origin/${branch}")
 bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR)
-[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${version}.tar.gz"
+[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${webadmin_version:0:10}.tar.gz"

 chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't be readable by others/group
-echo "Checking out code [${version}] into ${bundle_dir}"
-(cd "${SOURCE_DIR}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -))
+echo "Checking out code box version [${box_version}] and webadmin version [${webadmin_version}] into ${bundle_dir}"
+(cd "${SOURCE_DIR}" && git archive --format=tar ${box_version} | (cd "${bundle_dir}" && tar xf -))
+(cd "${SOURCE_DIR}/../webadmin" && git archive --format=tar ${webadmin_version} | (cd "${bundle_dir}" && tar xf -))
+(cp "${SOURCE_DIR}/../webadmin/LICENSE" "${bundle_dir}")

-if diff "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.all" "${bundle_dir}/npm-shrinkwrap.json" >/dev/null 2>&1; then
+if diff "${TMPDIR}/boxtarball.cache/package-lock.json.all" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
    echo "Reusing dev modules from cache"
    cp -r "${TMPDIR}/boxtarball.cache/node_modules-all/." "${bundle_dir}/node_modules"
 else
@@ -54,7 +61,7 @@ else
    echo "Caching dev dependencies"
    mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-all"
    rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-all/"
-    cp "${bundle_dir}/npm-shrinkwrap.json" "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.all"
+    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.all"
 fi

 echo "Building webadmin assets"
@@ -65,7 +72,7 @@ rm -rf "${bundle_dir}/node_modules/"
 rm -rf "${bundle_dir}/webadmin/src"
 rm -rf "${bundle_dir}/gulpfile.js"

-if diff "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.prod" "${bundle_dir}/npm-shrinkwrap.json" >/dev/null 2>&1; then
+if diff "${TMPDIR}/boxtarball.cache/package-lock.json.prod" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
    echo "Reusing prod modules from cache"
    cp -r "${TMPDIR}/boxtarball.cache/node_modules-prod/." "${bundle_dir}/node_modules"
 else
@@ -75,7 +82,7 @@ else
    echo "Caching prod dependencies"
    mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-prod"
    rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-prod/"
-    cp "${bundle_dir}/npm-shrinkwrap.json" "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.prod"
+    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.prod"
 fi

 echo "Create final tarball"
@@ -34,13 +34,41 @@ while true; do
    esac
 done

+echo "==> installer: updating docker"
+if [[ $(docker version --format {{.Client.Version}}) != "17.09.0-ce" ]]; then
+    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
+
+    # https://download.docker.com/linux/ubuntu/dists/xenial/stable/binary-amd64/Packages
+    if [[ $(sha256sum /tmp/docker.deb | cut -d' ' -f1) != "d33f6eb134f0ab0876148bd96de95ea47d583d7f2cddfdc6757979453f9bd9bf" ]]; then
+        echo "==> installer: docker binary download is corrupt"
+        exit 5
+    fi
+
+    echo "==> installer: Waiting for all dpkg tasks to finish..."
+    while fuser /var/lib/dpkg/lock; do
+        sleep 1
+    done
+
+    while ! dpkg --force-confold --configure -a; do
+        echo "==> installer: Failed to fix packages. Retry"
+        sleep 1
+    done
+
+    while ! apt install -y /tmp/docker.deb; do
+        echo "==> installer: Failed to install docker. Retry"
+        sleep 1
+    done
+
+    rm /tmp/docker.deb
+fi
+
 echo "==> installer: updating node"
-if [[ "$(node --version)" != "v6.11.3" ]]; then
-    mkdir -p /usr/local/node-6.11.3
-    $curl -sL https://nodejs.org/dist/v6.11.3/node-v6.11.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.3
-    ln -sf /usr/local/node-6.11.3/bin/node /usr/bin/node
-    ln -sf /usr/local/node-6.11.3/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-6.11.2
+if [[ "$(node --version)" != "v8.9.3" ]]; then
+    mkdir -p /usr/local/node-8.9.3
+    $curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
+    ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
+    ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
+    rm -rf /usr/local/node-6.11.5
 fi

 for try in `seq 1 10`; do
@@ -50,12 +78,12 @@ for try in `seq 1 10`; do
    # however by default npm drops privileges for npm rebuild
    # https://docs.npmjs.com/misc/config#unsafe-perm
    if cd "${box_src_tmp_dir}" && npm rebuild --unsafe-perm; then break; fi
-    echo "Failed to rebuild, trying again"
+    echo "==> installer: Failed to rebuild, trying again"
    sleep 5
 done

 if [[ ${try} -eq 10 ]]; then
-    echo "npm rebuild failed"
+    echo "==> installer: npm rebuild failed, giving up"
    exit 4
 fi

@@ -64,9 +92,8 @@ if ! id "${USER}" 2>/dev/null; then
 fi

 if [[ "${is_update}" == "yes" ]]; then
-    echo "Setting up update splash screen"
-    "${box_src_tmp_dir}/setup/splashpage.sh" --data "${arg_data}" || true # show splash from new code
-    ${BOX_SRC_DIR}/setup/stop.sh # stop the old code
+    echo "==> installer: stop cloudron.target service for update"
+    ${BOX_SRC_DIR}/setup/stop.sh
 fi

 # setup links to data directory
@@ -81,9 +108,6 @@ fi
 # ensure we are not inside the source directory, which we will remove now
 cd /root

-echo "==> installer: updating packages"
-# add logic to update apt packages here
-
 echo "==> installer: switching the box code"
 rm -rf "${BOX_SRC_DIR}"
 mv "${box_src_tmp_dir}" "${BOX_SRC_DIR}"
@@ -3,26 +3,16 @@
 source_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 json="${source_dir}/../node_modules/.bin/json"

-# IMPORTANT: Fix cloudron.js:doUpdate if you add/remove any arg. keep these sorted for readability
 arg_api_server_origin=""
-arg_fqdn=""
+arg_fqdn=""         # remove after 1.10
+arg_admin_domain=""
 arg_admin_location=""
-arg_zone_name=""
-arg_is_custom_domain="false"
-arg_restore_key=""
-arg_restore_url=""
+arg_admin_fqdn=""
 arg_retire_reason=""
 arg_retire_info=""
-arg_tls_config=""
-arg_tls_cert=""
-arg_tls_key=""
-arg_token=""
 arg_version=""
 arg_web_server_origin=""
-arg_backup_config=""
-arg_dns_config=""
 arg_provider=""
-arg_app_bundle=""
 arg_is_demo="false"

 args=$(getopt -o "" -l "data:,retire-reason:,retire-info:" -n "$0" -- "$@")
@@ -41,14 +31,14 @@ while true; do
    --data)
        # these params must be valid in all cases
        arg_fqdn=$(echo "$2" | $json fqdn)
-        arg_zone_name=$(echo "$2" | $json zoneName)
-
-        arg_is_custom_domain=$(echo "$2" | $json isCustomDomain)
-        [[ "${arg_is_custom_domain}" == "" ]] && arg_is_custom_domain="true"
+        arg_admin_fqdn=$(echo "$2" | $json adminFqdn)

        arg_admin_location=$(echo "$2" | $json adminLocation)
        [[ "${arg_admin_location}" == "" ]] && arg_admin_location="my"

+        arg_admin_domain=$(echo "$2" | $json adminDomain)
+        [[ "${arg_admin_domain}" == "" ]] && arg_admin_domain="${arg_fqdn}"
+
        # only update/restore have this valid (but not migrate)
        arg_api_server_origin=$(echo "$2" | $json apiServerOrigin)
        [[ "${arg_api_server_origin}" == "" ]] && arg_api_server_origin="https://api.cloudron.io"
@@ -59,36 +49,12 @@ while true; do
        arg_version=$(echo "$2" | $json version)

        # read possibly empty parameters here
-        arg_app_bundle=$(echo "$2" | $json appBundle)
-        [[ "${arg_app_bundle}" == "" ]] && arg_app_bundle="[]"
-
        arg_is_demo=$(echo "$2" | $json isDemo)
        [[ "${arg_is_demo}" == "" ]] && arg_is_demo="false"

-        arg_tls_cert=$(echo "$2" | $json tlsCert)
-        [[ "${arg_tls_cert}" == "null" ]] && arg_tls_cert=""
-        arg_tls_key=$(echo "$2" | $json tlsKey)
-        [[ "${arg_tls_key}" == "null" ]] && arg_tls_key=""
-        arg_token=$(echo "$2" | $json token)
-
        arg_provider=$(echo "$2" | $json provider)
        [[ "${arg_provider}" == "" ]] && arg_provider="generic"

-        arg_tls_config=$(echo "$2" | $json tlsConfig)
-        [[ "${arg_tls_config}" == "null" ]] && arg_tls_config=""
-
-        arg_restore_url=$(echo "$2" | $json restore.url)
-        [[ "${arg_restore_url}" == "null" ]] && arg_restore_url=""
-
-        arg_restore_key=$(echo "$2" | $json restore.key)
-        [[ "${arg_restore_key}" == "null" ]] && arg_restore_key=""
-
-        arg_backup_config=$(echo "$2" | $json backupConfig)
-        [[ "${arg_backup_config}" == "null" ]] && arg_backup_config=""
-
-        arg_dns_config=$(echo "$2" | $json dnsConfig)
-        [[ "${arg_dns_config}" == "null" ]] && arg_dns_config=""
-
        shift 2
        ;;
    --) break;;
@@ -98,15 +64,8 @@ done

 echo "Parsed arguments:"
 echo "api server: ${arg_api_server_origin}"
+echo "admin fqdn: ${arg_admin_fqdn}"
 echo "fqdn: ${arg_fqdn}"
-echo "custom domain: ${arg_is_custom_domain}"
-echo "restore url: ${arg_restore_url}"
-echo "tls cert: ${arg_tls_cert}"
-# do not dump these as they might become available via logs API
-#echo "restore key: ${arg_restore_key}"
-#echo "tls key: ${arg_tls_key}"
-#echo "token: ${arg_token}"
-echo "tlsConfig: ${arg_tls_config}"
 echo "version: ${arg_version}"
 echo "web server: ${arg_web_server_origin}"
 echo "provider: ${arg_provider}"
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-readonly SETUP_WEBSITE_DIR="/home/yellowtent/setup/website"
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly box_src_dir="$(realpath ${script_dir}/..)"
-readonly PLATFORM_DATA_DIR="/home/yellowtent/platformdata"
-
-echo "Setting up nginx update page"
-
-if [[ ! -f "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf" ]]; then
-    echo "No admin.conf found. This Cloudron has no domain yet. Skip splash setup"
-    exit
-fi
-
-source "${script_dir}/argparser.sh" "$@" # this injects the arg_* variables used below
-
-# keep this is sync with config.js appFqdn()
-admin_fqdn=$([[ "${arg_is_custom_domain}" == "true" ]] && echo "${arg_admin_location}.${arg_fqdn}" ||  echo "${arg_admin_location}-${arg_fqdn}")
-admin_origin="https://${admin_fqdn}"
-
-# copy the website
-rm -rf "${SETUP_WEBSITE_DIR}" && mkdir -p "${SETUP_WEBSITE_DIR}"
-cp -r "${script_dir}/splash/website/"* "${SETUP_WEBSITE_DIR}"
-
-# create nginx config
-readonly current_infra=$(node -e "console.log(require('${script_dir}/../src/infra_version.js').version);")
-existing_infra="none"
-[[ -f "${PLATFORM_DATA_DIR}/INFRA_VERSION" ]] && existing_infra=$(node -e "console.log(JSON.parse(require('fs').readFileSync('${PLATFORM_DATA_DIR}/INFRA_VERSION', 'utf8')).version);")
-if [[ "${arg_retire_reason}" != "" || "${existing_infra}" != "${current_infra}" ]]; then
-    echo "Showing progress bar on all subdomains in retired mode or infra update. retire: ${arg_retire_reason} existing: ${existing_infra} current: ${current_infra}"
-    rm -f ${PLATFORM_DATA_DIR}/nginx/applications/*
-    ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"~^(.+)\$\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
-else
-    echo "Show progress bar only on admin domain for normal update"
-    ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"${admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
-fi
-
-if [[ "${arg_retire_reason}" == "migrate" ]]; then
-    echo "{ \"migrate\": { \"percent\": \"10\", \"message\": \"Migrating cloudron. This could take up to 15 minutes.\", \"info\": ${arg_retire_info} }, \"backup\": null, \"apiServerOrigin\": \"${arg_api_server_origin}\" }" > "${SETUP_WEBSITE_DIR}/progress.json"
-else
-    echo '{ "update": { "percent": "10", "message": "Updating cloudron software" }, "backup": null }' > "${SETUP_WEBSITE_DIR}/progress.json"
-fi
-
-nginx -s reload
@@ -11,7 +11,6 @@ readonly PLATFORM_DATA_DIR="${HOME_DIR}/platformdata" # platform data
 readonly APPS_DATA_DIR="${HOME_DIR}/appsdata" # app data
 readonly BOX_DATA_DIR="${HOME_DIR}/boxdata" # box data
 readonly CONFIG_DIR="${HOME_DIR}/configs"
-readonly SETUP_PROGRESS_JSON="${HOME_DIR}/setup/website/progress.json"

 readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"

@@ -19,19 +18,11 @@ readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 source "${script_dir}/argparser.sh" "$@" # this injects the arg_* variables used below

-set_progress() {
-    local percent="$1"
-    local message="$2"
-
-    echo "==> ${percent} - ${message}"
-    (echo "{ \"update\": { \"percent\": \"${percent}\", \"message\": \"${message}\" }, \"backup\": {} }" > "${SETUP_PROGRESS_JSON}") 2> /dev/null || true # as this will fail in non-update mode
-}
-
-set_progress "20" "Configuring host"
+echo "==> Configuring host"
 sed -e 's/^#NTP=/NTP=0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org/' -i /etc/systemd/timesyncd.conf
 timedatectl set-ntp 1
 timedatectl set-timezone UTC
-hostnamectl set-hostname "${arg_fqdn}"
+hostnamectl set-hostname "${arg_admin_fqdn}"

 echo "==> Configuring docker"
 cp "${script_dir}/start/docker-cloudron-app.apparmor" /etc/apparmor.d/docker-cloudron-app
@@ -114,7 +105,7 @@ systemctl restart systemd-journald
 setfacl -n -m u:${USER}:r /var/log/journal/*/system.journal

 echo "==> Creating config directory"
-rm -rf "${CONFIG_DIR}" && mkdir "${CONFIG_DIR}"
+mkdir -p "${CONFIG_DIR}"

 echo "==> Setting up unbound"
 # DO uses Google nameservers by default. This causes RBL queries to fail (host 2.0.0.127.zen.spamhaus.org)
@@ -172,6 +163,9 @@ if ! grep -q "^Restart=" /etc/systemd/system/multi-user.target.wants/nginx.servi
    echo -e "\n[Service]\nRestart=always\n" >> /etc/systemd/system/multi-user.target.wants/nginx.service
    systemctl daemon-reload
 fi
+# remove this migration after 1.10
+[[ -f /etc/nginx/cert/host.cert ]] && cp /etc/nginx/cert/host.cert "/etc/nginx/cert/${arg_admin_domain}.host.cert"
+[[ -f /etc/nginx/cert/host.key ]] && cp /etc/nginx/cert/host.key "/etc/nginx/cert/${arg_admin_domain}.host.key"
 systemctl start nginx

 # bookkeep the version as part of data
@@ -199,95 +193,26 @@ readonly mysql_root_password="password"
 mysqladmin -u root -ppassword password password # reset default root password
 mysql -u root -p${mysql_root_password} -e 'CREATE DATABASE IF NOT EXISTS box'

-if [[ -n "${arg_restore_url}" ]]; then
-    set_progress "30" "Downloading restore data"
-
-    readonly restore_dir="${arg_restore_url#file://}"
-
-    if [[ -d "${restore_dir}" ]]; then # rsync backup
-        echo "==> Copying backup: ${restore_dir}"
-        if [[ $(stat -c "%d" "${BOX_DATA_DIR}") == $(stat -c "%d" "${restore_dir}") ]]; then
-            cp -rfl "${restore_dir}/." "${BOX_DATA_DIR}"
-        else
-            cp -rf "${restore_dir}/." "${BOX_DATA_DIR}"
-        fi
-    else # tgz backup
-        decrypt=""
-        if [[ "${arg_restore_url}" == *.tar.gz.enc || -n "${arg_restore_key}" ]]; then
-            echo "==> Downloading encrypted backup: ${arg_restore_url} and key: ${arg_restore_key}"
-            decrypt=(openssl aes-256-cbc -d -nosalt -pass "pass:${arg_restore_key}")
-        elif [[ "${arg_restore_url}" == *.tar.gz ]]; then
-            echo "==> Downloading backup: ${arg_restore_url}"
-            decrypt=(cat -)
-        fi
-
-        while true; do
-            if $curl -L "${arg_restore_url}" | "${decrypt[@]}" \
-            | tar -zxf - --overwrite -C "${BOX_DATA_DIR}"; then break; fi
-            echo "Failed to download data, trying again"
-        done
-    fi
-
-    set_progress "35" "Setting up MySQL"
-    if [[ -f "${BOX_DATA_DIR}/box.mysqldump" ]]; then
-        echo "==> Importing existing database into MySQL"
-        mysql -u root -p${mysql_root_password} box < "${BOX_DATA_DIR}/box.mysqldump"
-    fi
-fi
-
-set_progress "40" "Migrating data"
+echo "==> Migrating data"
 sudo -u "${USER}" -H bash <<EOF
 set -eu
 cd "${BOX_SRC_DIR}"
 BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
 EOF

-echo "==> Adding automated configs"
-mysql -u root -p${mysql_root_password} -e "REPLACE INTO settings (name, value) VALUES (\"domain\", '{ \"fqdn\": \"$arg_fqdn\", \"zoneName\": \"$arg_zone_name\", \"adminLocation\": \"$arg_admin_location\" }')" box
-
-if [[ ! -z "${arg_backup_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"backup_config\", '$arg_backup_config')" box
-fi
-
-if [[ ! -z "${arg_dns_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"dns_config\", '$arg_dns_config')" box
-fi
-
-if [[ ! -z "${arg_tls_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"tls_config\", '$arg_tls_config')" box
-fi
-
 echo "==> Creating cloudron.conf"
 cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
 {
    "version": "${arg_version}",
-    "token": "${arg_token}",
    "apiServerOrigin": "${arg_api_server_origin}",
    "webServerOrigin": "${arg_web_server_origin}",
-    "fqdn": "${arg_fqdn}",
+    "adminDomain": "${arg_admin_domain}",
+    "adminFqdn": "${arg_admin_fqdn}",
    "adminLocation": "${arg_admin_location}",
-    "zoneName": "${arg_zone_name}",
-    "isCustomDomain": ${arg_is_custom_domain},
    "provider": "${arg_provider}",
-    "isDemo": ${arg_is_demo},
-    "database": {
-        "hostname": "127.0.0.1",
-        "username": "root",
-        "password": "${mysql_root_password}",
-        "port": 3306,
-        "name": "box"
-    },
-    "appBundle": ${arg_app_bundle}
+    "isDemo": ${arg_is_demo}
 }
 CONF_END
-# pass these out-of-band because they have new lines which interfere with json
-if [[ -n "${arg_tls_cert}" && -n "${arg_tls_key}" ]]; then
-    echo "${arg_tls_cert}" > "${CONFIG_DIR}/host.cert"
-    echo "${arg_tls_key}" > "${CONFIG_DIR}/host.key"
-fi

 echo "==> Creating config.json for webadmin"
 cat > "${BOX_SRC_DIR}/webadmin/dist/config.json" <<CONF_END
@@ -313,11 +238,12 @@ chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 # do not chown the boxdata/mail directory; dovecot gets upset
 chown "${USER}:${USER}" "${BOX_DATA_DIR}"
 find "${BOX_DATA_DIR}" -mindepth 1 -maxdepth 1 -not -path "${BOX_DATA_DIR}/mail" -exec chown -R "${USER}:${USER}" {} \;
+chown "${USER}:${USER}" "${BOX_DATA_DIR}/mail"
 chown "${USER}:${USER}" -R "${BOX_DATA_DIR}/mail/dkim" # this is owned by box currently since it generates the keys

-set_progress "60" "Starting Cloudron"
+echo "==> Starting Cloudron"
 systemctl start cloudron.target

 sleep 2 # give systemd sometime to start the processes

-set_progress "90" "Almost done"
+echo "==> Almost done"
@@ -165,40 +165,6 @@ server {
        }
 <% } else if ( endpoint === 'app' ) { %>
        proxy_pass http://127.0.0.1:<%= port %>;
-<% } else if ( endpoint === 'splash' ) { %>
-        root   <%= sourceDir %>;
-
-        error_page 503 /update.html;
-
-        location /update.html {
-            add_header Cache-Control no-cache;
-        }
-
-        location /theme.css {
-            add_header Cache-Control no-cache;
-        }
-
-        location /3rdparty/ {
-            add_header Cache-Control no-cache;
-        }
-
-        location /js/ {
-            add_header Cache-Control no-cache;
-        }
-
-        location /progress.json {
-            add_header Cache-Control no-cache;
-        }
-
-        location /api/v1/cloudron/progress {
-            add_header Cache-Control no-cache;
-            default_type application/json;
-            alias <%= sourceDir %>/progress.json;
-        }
-
-        location / {
-            return 503;
-        }
 <% } %>
    }
 }
@@ -34,3 +34,6 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrot
 Defaults!/home/yellowtent/box/src/backuptask.js env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backuptask.js

+Defaults!/home/yellowtent/box/src/scripts/restart.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restart.sh
+
@@ -114,7 +114,7 @@ var RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh');
 function debugApp(app, args) {
    assert(!app || typeof app === 'object');

-    var prefix = app ? (app.location || 'naked_domain') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }

@@ -125,7 +125,7 @@ function setupAddons(app, addons, callback) {

    if (!addons) return callback(null);

-    debugApp(app, 'setupAddons: Settings up %j', Object.keys(addons));
+    debugApp(app, 'setupAddons: Setting up %j', Object.keys(addons));

    async.eachSeries(Object.keys(addons), function iterator(addon, iteratorCallback) {
        if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
@@ -245,10 +245,12 @@ function setupOauth(app, options, callback) {
    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

+    debugApp(app, 'setupOauth');
+
    if (!app.sso) return callback(null);

    var appId = app.id;
-    var redirectURI = 'https://' + (app.altDomain || config.appFqdn(app.location));
+    var redirectURI = 'https://' + (app.altDomain || app.intrinsicFqdn);
    var scope = 'profile';

    clients.delByAppIdAndType(appId, clients.TYPE_OAUTH, function (error) { // remove existing creds
@@ -297,7 +299,7 @@ function setupEmail(app, options, callback) {
        { name: 'MAIL_IMAP_PORT', value: '9993' },
        { name: 'MAIL_SIEVE_SERVER', value: 'mail' },
        { name: 'MAIL_SIEVE_PORT', value: '4190' },
-        { name: 'MAIL_DOMAIN', value: config.fqdn() }
+        { name: 'MAIL_DOMAIN', value: app.domain }
    ];

    debugApp(app, 'Setting up Email');
@@ -363,11 +365,11 @@ function setupSendMail(app, options, callback) {
        var env = [
            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
            { name: 'MAIL_SMTP_PORT', value: '2525' },
-            { name: 'MAIL_SMTPS_PORT', value: '4650' },
-            { name: 'MAIL_SMTP_USERNAME', value: mailbox.name },
+            { name: 'MAIL_SMTPS_PORT', value: '2465' },
+            { name: 'MAIL_SMTP_USERNAME', value: mailbox.name + '@' + app.domain },
            { name: 'MAIL_SMTP_PASSWORD', value: password },
-            { name: 'MAIL_FROM', value: mailbox.name + '@' + config.fqdn() },
-            { name: 'MAIL_DOMAIN', value: config.fqdn() }
+            { name: 'MAIL_FROM', value: mailbox.name + '@' + app.domain },
+            { name: 'MAIL_DOMAIN', value: app.domain }
        ];
        debugApp(app, 'Setting sendmail addon config to %j', env);
        appdb.setAddonConfig(app.id, 'sendmail', env, callback);
@@ -400,10 +402,10 @@ function setupRecvMail(app, options, callback) {
        var env = [
            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
            { name: 'MAIL_IMAP_PORT', value: '9993' },
-            { name: 'MAIL_IMAP_USERNAME', value: mailbox.name },
+            { name: 'MAIL_IMAP_USERNAME', value: mailbox.name + '@' + app.domain },
            { name: 'MAIL_IMAP_PASSWORD', value: password },
-            { name: 'MAIL_TO', value: mailbox.name + '@' + config.fqdn() },
-            { name: 'MAIL_DOMAIN', value: config.fqdn() }
+            { name: 'MAIL_TO', value: mailbox.name + '@' + app.domain },
+            { name: 'MAIL_DOMAIN', value: app.domain }
        ];

        debugApp(app, 'Setting sendmail addon config to %j', env);
@@ -645,9 +647,10 @@ function setupRedis(app, options, callback) {
    }

    const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
+    const label = app.intrinsicFqdn;
    // note that we do not add appId label because this interferes with the stop/start app logic
    const cmd = `docker run --restart=always -d --name=${redisName} \
-                --label=location=${app.location} \
+                --label=location=${label} \
                --net cloudron \
                --net-alias ${redisName} \
                -m ${memoryLimit/2} \
@@ -682,24 +685,24 @@ function teardownRedis(app, options, callback) {
    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

-   var container = dockerConnection.getContainer('redis-' + app.id);
+    var container = dockerConnection.getContainer('redis-' + app.id);

-   var removeOptions = {
-       force: true, // kill container if it's running
-       v: true // removes volumes associated with the container
-   };
+    var removeOptions = {
+        force: true, // kill container if it's running
+        v: true // removes volumes associated with the container
+    };

-   container.remove(removeOptions, function (error) {
-       if (error && error.statusCode !== 404) return callback(new Error('Error removing container:' + error));
+    container.remove(removeOptions, function (error) {
+        if (error && error.statusCode !== 404) return callback(new Error('Error removing container:' + error));

-       safe.fs.unlinkSync(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');
+        safe.fs.unlinkSync(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');

        shell.sudo('teardownRedis', [ RMAPPDIR_CMD, app.id + '/redis', true /* delete directory */ ], function (error, stdout, stderr) {
            if (error) return callback(new Error('Error removing redis data:' + error));

            appdb.unsetAddonConfig(app.id, 'redis', callback);
        });
-   });
+    });
 }

 function backupRedis(app, options, callback) {
@@ -59,9 +59,10 @@ var assert = require('assert'),
    util = require('util');

 var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
-    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.dnsRecordId',
-    'apps.accessRestrictionJson', 'apps.lastBackupId', 'apps.oldConfigJson', 'apps.newConfigJson', 'apps.memoryLimit', 'apps.altDomain',
-    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup' ].join(',');
+    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.domain', 'apps.dnsRecordId',
+    'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit',
+    'apps.altDomain', 'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
+    'apps.creationTime', 'apps.updateTime' ].join(',');

 var PORT_BINDINGS_FIELDS = [ 'hostPort', 'environmentVariable', 'appId' ].join(',');

@@ -76,9 +77,13 @@ function postProcess(result) {
    result.oldConfig = safe.JSON.parse(result.oldConfigJson);
    delete result.oldConfigJson;

-    assert(result.newConfigJson === null || typeof result.newConfigJson === 'string');
-    result.newConfig = safe.JSON.parse(result.newConfigJson);
-    delete result.newConfigJson;
+    assert(result.updateConfigJson === null || typeof result.updateConfigJson === 'string');
+    result.updateConfig = safe.JSON.parse(result.updateConfigJson);
+    delete result.updateConfigJson;
+
+    assert(result.restoreConfigJson === null || typeof result.restoreConfigJson === 'string');
+    result.restoreConfig = safe.JSON.parse(result.restoreConfigJson);
+    delete result.restoreConfigJson;

    assert(result.hostPorts === null || typeof result.hostPorts === 'string');
    assert(result.environmentVariables === null || typeof result.environmentVariables === 'string');
@@ -173,12 +178,13 @@ function getAll(callback) {
    });
 }

-function add(id, appStoreId, manifest, location, portBindings, data, callback) {
+function add(id, appStoreId, manifest, location, domain, portBindings, data, callback) {
    assert.strictEqual(typeof id, 'string');
    assert.strictEqual(typeof appStoreId, 'string');
    assert(manifest && typeof manifest === 'object');
    assert.strictEqual(typeof manifest.version, 'string');
    assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof portBindings, 'object');
    assert(data && typeof data === 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -193,14 +199,14 @@ function add(id, appStoreId, manifest, location, portBindings, data, callback) {
    var altDomain = data.altDomain || null;
    var xFrameOptions = data.xFrameOptions || '';
    var installationState = data.installationState || exports.ISTATE_PENDING_INSTALL;
-    var lastBackupId = data.lastBackupId || null; // used when cloning
+    var restoreConfigJson = data.restoreConfig ? JSON.stringify(data.restoreConfig) : null; // used when cloning
    var sso = 'sso' in data ? data.sso : null;
    var debugModeJson = data.debugMode ? JSON.stringify(data.debugMode) : null;

    var queries = [];
    queries.push({
-        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, location, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, lastBackupId, sso, debugModeJson) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [ id, appStoreId, manifestJson, installationState, location, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, lastBackupId, sso, debugModeJson ]
+        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [ id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson ]
    });

    Object.keys(portBindings).forEach(function (env) {
@@ -213,13 +219,14 @@ function add(id, appStoreId, manifest, location, portBindings, data, callback) {
    // only allocate a mailbox if mailboxName is set
    if (data.mailboxName) {
        queries.push({
-            query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)',
-            args: [ data.mailboxName, id, mailboxdb.TYPE_APP ]
+            query: 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)',
+            args: [ data.mailboxName, domain, id, mailboxdb.TYPE_APP ]
        });
    }

    database.transaction(queries, function (error) {
        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error.message));
+        if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND, 'no such domain'));
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

        callback(null);
@@ -322,7 +329,7 @@ function updateWithConstraints(id, app, constraints, callback) {

    var fields = [ ], values = [ ];
    for (var p in app) {
-        if (p === 'manifest' || p === 'oldConfig' || p === 'newConfig' || p === 'accessRestriction' || p === 'debugMode') {
+        if (p === 'manifest' || p === 'oldConfig' || p === 'updateConfig' || p === 'restoreConfig' || p === 'accessRestriction' || p === 'debugMode') {
            fields.push(`${p}Json = ?`);
            values.push(JSON.stringify(app[p]));
        } else if (p !== 'portBindings') {
@@ -376,14 +383,14 @@ function setInstallationCommand(appId, installationState, values, callback) {
    // Rules are:
    // uninstall is allowed in any state
    // force update is allowed in any state including pending_uninstall! (for better or worse)
-    // restore is allowed from installed or error state
+    // restore is allowed from installed or error state or currently restoring
    // configure is allowed in installed state or currently configuring or in error state
    // update and backup are allowed only in installed state

    if (installationState === exports.ISTATE_PENDING_UNINSTALL || installationState === exports.ISTATE_PENDING_FORCE_UPDATE) {
        updateWithConstraints(appId, values, '', callback);
    } else if (installationState === exports.ISTATE_PENDING_RESTORE) {
-        updateWithConstraints(appId, values, 'AND (installationState = "installed" OR installationState = "error")', callback);
+        updateWithConstraints(appId, values, 'AND (installationState = "installed" OR installationState = "error" OR installationState = "pending_restore")', callback);
    } else if (installationState === exports.ISTATE_PENDING_UPDATE || installationState === exports.ISTATE_PENDING_BACKUP) {
        updateWithConstraints(appId, values, 'AND installationState = "installed"', callback);
    } else if (installationState === exports.ISTATE_PENDING_CONFIGURE) {
@@ -5,6 +5,7 @@ var appdb = require('./appdb.js'),
    assert = require('assert'),
    async = require('async'),
    DatabaseError = require('./databaseerror.js'),
+    config = require('./config.js'),
    debug = require('debug')('box:apphealthmonitor'),
    docker = require('./docker.js').connection,
    mailer = require('./mailer.js'),
@@ -25,7 +26,7 @@ var gDockerEventStream = null;
 function debugApp(app) {
    assert(!app || typeof app === 'object');

-    var prefix = app ? (app.location || 'naked_domain') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
    var manifestAppId = app ? app.manifest.id : '';
    var id = app ? app.id : '';

@@ -54,25 +54,30 @@ var addons = require('./addons.js'),
    async = require('async'),
    backups = require('./backups.js'),
    BackupsError = backups.BackupsError,
-    certificates = require('./certificates.js'),
    config = require('./config.js'),
    constants = require('./constants.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:apps'),
    docker = require('./docker.js'),
+    domaindb = require('./domaindb.js'),
+    domains = require('./domains.js'),
+    DomainError = require('./domains.js').DomainError,
    eventlog = require('./eventlog.js'),
    fs = require('fs'),
    groups = require('./groups.js'),
    mailboxdb = require('./mailboxdb.js'),
    manifestFormat = require('cloudron-manifestformat'),
+    os = require('os'),
    path = require('path'),
    paths = require('./paths.js'),
+    reverseProxy = require('./reverseproxy.js'),
    safe = require('safetydance'),
    semver = require('semver'),
    spawn = require('child_process').spawn,
    split = require('split'),
    superagent = require('superagent'),
    taskmanager = require('./taskmanager.js'),
+    tld = require('tldjs'),
    TransformStream = require('stream').Transform,
    updateChecker = require('./updatechecker.js'),
    url = require('url'),
@@ -116,18 +121,33 @@ AppsError.BAD_CERTIFICATE = 'Invalid certificate';
 // Hostname validation comes from RFC 1123 (section 2.1)
 // Domain name validation comes from RFC 2181 (Name syntax)
 // https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
-// We are validating the validity of the location-fqdn as host name
-function validateHostname(location, fqdn) {
-    var RESERVED_LOCATIONS = [ config.adminLocation(), constants.API_LOCATION, constants.SMTP_LOCATION, constants.IMAP_LOCATION, config.mailLocation(), constants.POSTMAN_LOCATION ];
+// We are validating the validity of the location-fqdn as host name (and not dns name)
+function validateHostname(location, domain, hostname) {
+    assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof hostname, 'string');

+    const RESERVED_LOCATIONS = [
+        constants.API_LOCATION,
+        constants.SMTP_LOCATION,
+        constants.IMAP_LOCATION
+    ];
    if (RESERVED_LOCATIONS.indexOf(location) !== -1) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');

-    if (location === '') return null; // bare location
+    if (hostname === config.adminFqdn()) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');

-    if ((location.length + 1 /*+ hyphen */ + fqdn.indexOf('.')) > 63) return new AppsError(AppsError.BAD_FIELD, 'Hostname length cannot be greater than 63');
-    if (location.match(/^[A-Za-z0-9-]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Hostname can only contain alphanumerics and hyphen');
-    if (location[0] === '-' || location[location.length-1] === '-') return new AppsError(AppsError.BAD_FIELD, 'Hostname cannot start or end with hyphen');
-    if (location.length + 1 /* hyphen */ + fqdn.length > 253) return new AppsError(AppsError.BAD_FIELD, 'FQDN length exceeds 253 characters');
+    // workaround https://github.com/oncletom/tld.js/issues/73
+    var tmp = hostname.replace('_', '-');
+    if (!tld.isValid(tmp)) return new AppsError(AppsError.BAD_FIELD, 'Hostname is not a valid domain name');
+
+    if (hostname.length > 253) return new AppsError(AppsError.BAD_FIELD, 'Hostname length exceeds 253 characters');
+
+    if (location) {
+        // label validation
+        if (location.length > 63) return new AppsError(AppsError.BAD_FIELD, 'Subdomain exceeds 63 characters');
+        if (location.match(/^[A-Za-z0-9-]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Subdomain can only contain alphanumerics and hyphen');
+        if (location.startsWith('-') || location.endsWith('-')) return new AppsError(AppsError.BAD_FIELD, 'Subdomain cannot start or end with hyphen');
+    }

    return null;
 }
@@ -208,7 +228,7 @@ function validateMemoryLimit(manifest, memoryLimit) {
    assert.strictEqual(typeof memoryLimit, 'number');

    var min = manifest.memoryLimit || constants.DEFAULT_MEMORY_LIMIT;
-    var max = (4096 * 1024 * 1024);
+    var max = os.totalmem() * 2; // this will overallocate since we don't allocate equal swap always (#466)

    // allow 0, which indicates that it is not set, the one from the manifest will be choosen but we don't commit any user value
    // this is needed so an app update can change the value in the manifest, and if not set by the user, the new value should be used
@@ -258,6 +278,12 @@ function validateRobotsTxt(robotsTxt) {
    return null;
 }

+function validateBackupFormat(format) {
+    if (format === 'tgz' || format == 'rsync') return null;
+
+    return new AppsError(AppsError.BAD_FIELD, 'Invalid backup format');
+}
+
 function getDuplicateErrorDetails(location, portBindings, error) {
    assert.strictEqual(typeof location, 'string');
    assert.strictEqual(typeof portBindings, 'object');
@@ -284,6 +310,8 @@ function getAppConfig(app) {
    return {
        manifest: app.manifest,
        location: app.location,
+        domain: app.domain,
+        intrinsicFqdn: app.intrinsicFqdn,
        accessRestriction: app.accessRestriction,
        portBindings: app.portBindings,
        memoryLimit: app.memoryLimit,
@@ -308,12 +336,18 @@ function hasAccessTo(app, user, callback) {
    if (app.accessRestriction.users.some(function (e) { return e === user.id; })) return callback(null, true);

    // check group access
-    if (!app.accessRestriction.groups) return callback(null, false);
+    groups.getGroups(user.id, function (error, groupIds) {
+        if (error) return callback(null, false);

-    async.some(app.accessRestriction.groups, function (groupId, iteratorDone) {
-        groups.isMember(groupId, user.id, iteratorDone);
-    }, function (error, result) {
-        callback(null, !error && result);
+        const isAdmin = groupIds.indexOf(constants.ADMIN_GROUP_ID) !== -1;
+
+        if (isAdmin) return callback(null, true); // admins can always access any app
+
+        if (!app.accessRestriction.groups) return callback(null, false);
+
+        if (app.accessRestriction.groups.some(function (gid) { return groupIds.indexOf(gid) !== -1; })) return callback(null, true);
+
+        callback(null, false);
    });
 }

@@ -325,11 +359,16 @@ function get(appId, callback) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        app.iconUrl = getIconUrlSync(app);
-        app.fqdn = app.altDomain || config.appFqdn(app.location);
-        app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
+        domaindb.get(app.domain, function (error, result) {
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        callback(null, app);
+            app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+            app.iconUrl = getIconUrlSync(app);
+            app.fqdn = app.altDomain || app.intrinsicFqdn;
+            app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+            callback(null, app);
+        });
    });
 }

@@ -344,11 +383,16 @@ function getByIpAddress(ip, callback) {
            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            app.iconUrl = getIconUrlSync(app);
-            app.fqdn = app.altDomain || config.appFqdn(app.location);
-            app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
+            domaindb.get(app.domain, function (error, result) {
+                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            callback(null, app);
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.iconUrl = getIconUrlSync(app);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+                callback(null, app);
+            });
        });
    });
 }
@@ -359,13 +403,22 @@ function getAll(callback) {
    appdb.getAll(function (error, apps) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        apps.forEach(function (app) {
-            app.iconUrl = getIconUrlSync(app);
-            app.fqdn = app.altDomain || config.appFqdn(app.location);
-            app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
-        });
+        async.eachSeries(apps, function (app, iteratorDone) {
+            domaindb.get(app.domain, function (error, result) {
+                if (error) return iteratorDone(new AppsError(AppsError.INTERNAL_ERROR, error));

-        callback(null, apps);
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.iconUrl = getIconUrlSync(app);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+                iteratorDone();
+            });
+        }, function (error) {
+            if (error) return callback(error);
+
+            callback(null, apps);
+        });
    });
 }

@@ -396,7 +449,7 @@ function downloadManifest(appStoreId, manifest, callback) {
    superagent.get(url).timeout(30 * 1000).end(function (error, result) {
        if (error && !error.response) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Network error downloading manifest:' + error.message));

-        if (result.statusCode !== 200) return callback(new AppsError(AppsError.BAD_FIELD, util.format('Failed to get app info from store.', result.statusCode, result.text)));
+        if (result.statusCode !== 200) return callback(new AppsError(AppsError.NOT_FOUND, util.format('Failed to get app info from store.', result.statusCode, result.text)));

        callback(null, parts[0], result.body.manifest);
    });
@@ -408,6 +461,7 @@ function install(data, auditSource, callback) {
    assert.strictEqual(typeof callback, 'function');

    var location = data.location.toLowerCase(),
+        domain = data.domain.toLowerCase(),
        portBindings = data.portBindings || null,
        accessRestriction = data.accessRestriction || null,
        icon = data.icon || null,
@@ -420,7 +474,8 @@ function install(data, auditSource, callback) {
        debugMode = data.debugMode || null,
        robotsTxt = data.robotsTxt || null,
        enableBackup = 'enableBackup' in data ? data.enableBackup : true,
-        backupId = data.backupId || null;
+        backupId = data.backupId || null,
+        backupFormat = data.backupFormat || 'tgz';

    assert(data.appStoreId || data.manifest); // atleast one of them is required

@@ -433,9 +488,6 @@ function install(data, auditSource, callback) {
        error = checkManifestConstraints(manifest);
        if (error) return callback(error);

-        error = validateHostname(location, config.fqdn());
-        if (error) return callback(error);
-
        error = validatePortBindings(portBindings, manifest.tcpPorts);
        if (error) return callback(error);

@@ -454,6 +506,9 @@ function install(data, auditSource, callback) {
        error = validateRobotsTxt(robotsTxt);
        if (error) return callback(error);

+        error = validateBackupFormat(backupFormat);
+        if (error) return callback(error);
+
        if ('sso' in data && !('optionalSso' in manifest)) return callback(new AppsError(AppsError.BAD_FIELD, 'sso can only be specified for apps with optionalSso'));
        // if sso was unspecified, enable it by default if possible
        if (sso === null) sso = !!manifest.addons['ldap'] || !!manifest.addons['oauth'];
@@ -470,45 +525,58 @@ function install(data, auditSource, callback) {
            }
        }

-        error = certificates.validateCertificate(cert, key, config.appFqdn(location));
-        if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+        domains.get(domain, function (error, domainObject) {
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

-        debug('Will install app with id : ' + appId);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);

-        appstore.purchase(appId, appStoreId, function (error) {
-            if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-            if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
-            if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+            error = validateHostname(location, domain, intrinsicFqdn);
+            if (error) return callback(error);

-            var data = {
-                accessRestriction: accessRestriction,
-                memoryLimit: memoryLimit,
-                altDomain: altDomain,
-                xFrameOptions: xFrameOptions,
-                sso: sso,
-                debugMode: debugMode,
-                mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app',
-                lastBackupId: backupId,
-                enableBackup: enableBackup,
-                robotsTxt: robotsTxt
-            };
+            if (cert && key) {
+                error = reverseProxy.validateCertificate(intrinsicFqdn, cert, key);
+                if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+            }

-            appdb.add(appId, appStoreId, manifest, location, portBindings, data, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+            debug('Will install app with id : ' + appId);
+
+            appstore.purchase(appId, appStoreId, function (error) {
+                if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+                if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
+                if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                // save cert to boxdata/certs
-                if (cert && key) {
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'), cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'), key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
-                }
+                var data = {
+                    accessRestriction: accessRestriction,
+                    memoryLimit: memoryLimit,
+                    altDomain: altDomain,
+                    xFrameOptions: xFrameOptions,
+                    sso: sso,
+                    debugMode: debugMode,
+                    mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app',
+                    restoreConfig: backupId ? { backupId: backupId, backupFormat: backupFormat } : null,
+                    enableBackup: enableBackup,
+                    robotsTxt: robotsTxt,
+                    intrinsicFqdn: intrinsicFqdn
+                };

-                taskmanager.restartAppTask(appId);
+                appdb.add(appId, appStoreId, manifest, location, domain, portBindings, data, function (error) {
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, location: location, manifest: manifest, backupId: backupId });
+                    // save cert to boxdata/certs
+                    if (cert && key) {
+                        if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.cert'), cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
+                        if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.key'), key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                    }

-                callback(null, { id : appId });
+                    taskmanager.restartAppTask(appId);
+
+                    eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, location: location, domain: domain, manifest: manifest, backupId: backupId });
+
+                    callback(null, { id : appId });
+                });
            });
        });
    });
@@ -524,14 +592,12 @@ function configure(appId, data, auditSource, callback) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        var location, portBindings, values = { };
-        if ('location' in data) {
-            location = values.location = data.location.toLowerCase();
-            error = validateHostname(values.location, config.fqdn());
-            if (error) return callback(error);
-        } else {
-            location = app.location;
-        }
+        var domain, location, portBindings, values = { };
+        if ('location' in data) location = values.location = data.location.toLowerCase();
+        else location = app.location;
+
+        if ('domain' in data) domain = values.domain = data.domain.toLowerCase();
+        else domain = app.domain;

        if ('accessRestriction' in data) {
            values.accessRestriction = data.accessRestriction;
@@ -576,43 +642,55 @@ function configure(appId, data, auditSource, callback) {
            if (error) return callback(error);
        }

-        // save cert to boxdata/certs. TODO: move this to apptask when we have a real task queue
-        if ('cert' in data && 'key' in data) {
-            if (data.cert && data.key) {
-                error = certificates.validateCertificate(data.cert, data.key, config.appFqdn(location));
-                if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+        domains.get(domain, function (error, domainObject) {
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

-                if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'), data.cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
-                if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'), data.key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
-            } else { // remove existing cert/key
-                if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'))) debug('Error removing cert: ' + safe.error.message);
-                if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'))) debug('Error removing key: ' + safe.error.message);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
+
+            error = validateHostname(location, domain, intrinsicFqdn);
+            if (error) return callback(error);
+
+            // save cert to boxdata/certs. TODO: move this to apptask when we have a real task queue
+            if ('cert' in data && 'key' in data) {
+                if (data.cert && data.key) {
+                    var vhost = values.altDomain || intrinsicFqdn;
+
+                    error = reverseProxy.validateCertificate(vhost, data.cert, data.key);
+                    if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${vhost}.user.cert`), data.cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${vhost}.user.key`), data.key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                } else { // remove existing cert/key
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, `${vhost}.user.cert`))) debug('Error removing cert: ' + safe.error.message);
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, `${vhost}..user.key`))) debug('Error removing key: ' + safe.error.message);
+                }
            }
-        }

-        if ('enableBackup' in data) values.enableBackup = data.enableBackup;
+            if ('enableBackup' in data) values.enableBackup = data.enableBackup;

-        values.oldConfig = getAppConfig(app);
+            values.oldConfig = getAppConfig(app);

-        debug('Will configure app with id:%s values:%j', appId, values);
+            debug('Will configure app with id:%s values:%j', appId, values);

-        var oldName = (app.location ? app.location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-        var newName = (location ? location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-        mailboxdb.updateName(oldName, newName, function (error) {
-            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, 'This mailbox is already taken'));
-            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-            appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+            var oldName = (app.location ? app.location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+            var newName = (location ? location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+            mailboxdb.updateName(oldName, values.oldConfig.domain, newName, domain, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, 'This mailbox is already taken'));
                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                taskmanager.restartAppTask(appId);
+                appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
+                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId });
+                    taskmanager.restartAppTask(appId);

-                callback(null);
+                    eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId });
+
+                    callback(null);
+                });
            });
        });
    });
@@ -629,7 +707,7 @@ function update(appId, data, auditSource, callback) {
    downloadManifest(data.appStoreId, data.manifest, function (error, appStoreId, manifest) {
        if (error) return callback(error);

-        var newConfig = { };
+        var updateConfig = { };

        error = manifestFormat.parse(manifest);
        if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Manifest error:' + error.message));
@@ -637,7 +715,7 @@ function update(appId, data, auditSource, callback) {
        error = checkManifestConstraints(manifest);
        if (error) return callback(error);

-        newConfig.manifest = manifest;
+        updateConfig.manifest = manifest;

        if ('icon' in data) {
            if (data.icon) {
@@ -657,22 +735,22 @@ function update(appId, data, auditSource, callback) {

            // prevent user from installing a app with different manifest id over an existing app
            // this allows cloudron install -f --app <appid> for an app installed from the appStore
-            if (app.manifest.id !== newConfig.manifest.id) {
+            if (app.manifest.id !== updateConfig.manifest.id) {
                if (!data.force) return callback(new AppsError(AppsError.BAD_FIELD, 'manifest id does not match. force to override'));
                // clear appStoreId so that this app does not get updates anymore
-                newConfig.appStoreId = '';
+                updateConfig.appStoreId = '';
            }

            // do not update apps in debug mode
            if (app.debugMode && !data.force) return callback(new AppsError(AppsError.BAD_STATE, 'debug mode enabled. force to override'));

            // Ensure we update the memory limit in case the new app requires more memory as a minimum
-            // 0 and -1 are special newConfig for memory limit indicating unset and unlimited
-            if (app.memoryLimit > 0 && newConfig.manifest.memoryLimit && app.memoryLimit < newConfig.manifest.memoryLimit) {
-                newConfig.memoryLimit = newConfig.manifest.memoryLimit;
+            // 0 and -1 are special updateConfig for memory limit indicating unset and unlimited
+            if (app.memoryLimit > 0 && updateConfig.manifest.memoryLimit && app.memoryLimit < updateConfig.manifest.memoryLimit) {
+                updateConfig.memoryLimit = updateConfig.manifest.memoryLimit;
            }

-            appdb.setInstallationCommand(appId, data.force ? appdb.ISTATE_PENDING_FORCE_UPDATE : appdb.ISTATE_PENDING_UPDATE, { newConfig: newConfig }, function (error) {
+            appdb.setInstallationCommand(appId, data.force ? appdb.ISTATE_PENDING_FORCE_UPDATE : appdb.ISTATE_PENDING_UPDATE, { updateConfig: updateConfig }, function (error) {
                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

@@ -754,22 +832,22 @@ function restore(appId, data, auditSource, callback) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

        // for empty or null backupId, use existing manifest to mimic a reinstall
-        var func = data.backupId ? backups.getRestoreConfig.bind(null, data.backupId) : function (next) { return next(null, { manifest: app.manifest }); };
+        var func = data.backupId ? backups.get.bind(null, data.backupId) : function (next) { return next(null, { manifest: app.manifest }); };

-        func(function (error, restoreConfig) {
+        func(function (error, backupInfo) {
            if (error && error.reason === BackupsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
            if (error && error.reason === BackupsError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            if (!restoreConfig) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config'));
+            if (!backupInfo.manifest) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore manifest'));

            // re-validate because this new box version may not accept old configs
-            error = checkManifestConstraints(restoreConfig.manifest);
+            error = checkManifestConstraints(backupInfo.manifest);
            if (error) return callback(error);

            var values = {
-                lastBackupId: data.backupId || null, // when null, apptask simply reinstalls
-                manifest: restoreConfig.manifest,
+                restoreConfig: data.backupId ? { backupId: data.backupId, backupFormat: backupInfo.format } : null, // when null, apptask simply reinstalls
+                manifest: backupInfo.manifest,

                oldConfig: getAppConfig(app)
            };
@@ -797,61 +875,70 @@ function clone(appId, data, auditSource, callback) {
    debug('Will clone app with id:%s', appId);

    var location = data.location.toLowerCase(),
+        domain = data.domain.toLowerCase(),
        portBindings = data.portBindings || null,
        backupId = data.backupId;

    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof portBindings, 'object');

    appdb.get(appId, function (error, app) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        backups.getRestoreConfig(backupId, function (error, restoreConfig) {
+        backups.get(backupId, function (error, backupInfo) {
            if (error && error.reason === BackupsError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
            if (error && error.reason === BackupsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            if (!restoreConfig) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config'));
+            if (!backupInfo.manifest) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config'));

            // re-validate because this new box version may not accept old configs
-            error = checkManifestConstraints(restoreConfig.manifest);
+            error = checkManifestConstraints(backupInfo.manifest);
            if (error) return callback(error);

-            error = validateHostname(location, config.fqdn());
+            error = validatePortBindings(portBindings, backupInfo.manifest.tcpPorts);
            if (error) return callback(error);

-            error = validatePortBindings(portBindings, restoreConfig.manifest.tcpPorts);
-            if (error) return callback(error);
+            domains.get(domain, function (error, domainObject) {
+                if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

-            var newAppId = uuid.v4(), appStoreId = app.appStoreId, manifest = restoreConfig.manifest;
+                var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);

-            appstore.purchase(newAppId, appStoreId, function (error) {
-                if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-                if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
-                if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                error = validateHostname(location, domain, intrinsicFqdn);
+                if (error) return callback(error);

-                var data = {
-                    installationState: appdb.ISTATE_PENDING_CLONE,
-                    memoryLimit: app.memoryLimit,
-                    accessRestriction: app.accessRestriction,
-                    xFrameOptions: app.xFrameOptions,
-                    lastBackupId: backupId,
-                    sso: !!app.sso,
-                    mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app'
-                };
+                var newAppId = uuid.v4(), manifest = backupInfo.manifest;

-                appdb.add(newAppId, appStoreId, manifest, location, portBindings, data, function (error) {
-                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                appstore.purchase(newAppId, app.appStoreId, function (error) {
+                    if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+                    if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
+                    if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                    taskmanager.restartAppTask(newAppId);
+                    var data = {
+                        installationState: appdb.ISTATE_PENDING_CLONE,
+                        memoryLimit: app.memoryLimit,
+                        accessRestriction: app.accessRestriction,
+                        xFrameOptions: app.xFrameOptions,
+                        restoreConfig: { backupId: backupId, backupFormat: backupInfo.format },
+                        sso: !!app.sso,
+                        mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app'
+                    };

-                    eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, location: location, manifest: manifest });
+                    appdb.add(newAppId, app.appStoreId, manifest, location, domain, portBindings, data, function (error) {
+                        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                    callback(null, { id : newAppId });
+                        taskmanager.restartAppTask(newAppId);
+
+                        eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, location: location, manifest: manifest });
+
+                        callback(null, { id : newAppId });
+                    });
                });
            });
        });
@@ -1021,7 +1108,7 @@ function autoupdateApps(updateInfo, auditSource, callback) { // updateInfo is {
            if (error) {
                debug('Cannot autoupdate app %s : %s', appId, error.message);
                return iteratorDone();
-           }
+            }

            error = canAutoupdateApp(app, updateInfo[appId].manifest);
            if (error) {
@@ -1089,12 +1176,16 @@ function restoreInstalledApps(callback) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

        async.map(apps, function (app, iteratorDone) {
-            debug('marking %s for restore', app.location || app.id);
+            debug('marking %s for restore', app.intrinsicFqdn);

-            appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { oldConfig: null }, function (error) {
-                if (error) debug('did not mark %s for restore', app.location || app.id, error);
+            backups.getByAppIdPaged(1, 1, app.id, function (error, results) {
+                var restoreConfig = !error && results.length ? { backupId: results[0].id, backupFormat: results[0].format } : null;

-                iteratorDone(); // always succeed
+                appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { restoreConfig: restoreConfig, oldConfig: null }, function (error) {
+                    if (error) debug('did not mark %s for restore', app.intrinsicFqdn, error);
+
+                    iteratorDone(); // always succeed
+                });
            });
        }, callback);
    });
@@ -1107,10 +1198,10 @@ function configureInstalledApps(callback) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

        async.map(apps, function (app, iteratorDone) {
-            debug('marking %s for reconfigure', app.location || app.id);
+            debug('marking %s for reconfigure', app.intrinsicFqdn);

            appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_CONFIGURE, { oldConfig: null }, function (error) {
-                if (error) debug('did not mark %s for reconfigure', app.location || app.id, error);
+                if (error) debug('did not mark %s for reconfigure', app.intrinsicFqdn, error);

                iteratorDone(); // always succeed
            });
@@ -1192,7 +1283,7 @@ function uploadFile(appId, sourceFilePath, destFilePath, callback) {
        if (error) return callback(error);

        var readFile = fs.createReadStream(sourceFilePath);
-        readFile.on('error', console.error);
+        readFile.on('error', callback);

        readFile.pipe(stream);

@@ -13,6 +13,8 @@ exports = module.exports = {

    getAccount: getAccount,

+    sendFeedback: sendFeedback,
+
    AppstoreError: AppstoreError
 };

@@ -20,7 +22,10 @@ var assert = require('assert'),
    config = require('./config.js'),
    debug = require('debug')('box:appstore'),
    eventlog = require('./eventlog.js'),
+    mail = require('./mail.js'),
    os = require('os'),
+    safe = require('safetydance'),
+    semver = require('semver'),
    settings = require('./settings.js'),
    superagent = require('superagent'),
    util = require('util');
@@ -54,23 +59,12 @@ var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 function getAppstoreConfig(callback) {
    assert.strictEqual(typeof callback, 'function');

-    // Caas Cloudrons do not store appstore credentials in their local database
-    if (config.provider() === 'caas') {
-        var url = config.apiServerOrigin() + '/api/v1/exchangeBoxTokenWithUserToken';
-        superagent.post(url).query({ token: config.token() }).timeout(30 * 1000).end(function (error, result) {
-            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-            if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', result.status, result.body)));
+    settings.getAppstoreConfig(function (error, result) {
+        if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
+        if (!result.token) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));

-            callback(null, result.body);
-        });
-    } else {
-        settings.getAppstoreConfig(function (error, result) {
-            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-            if (!result.token) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
-
-            callback(null, result);
-        });
-    }
+        callback(null, result);
+    });
 }

 function getSubscription(callback) {
@@ -152,59 +146,55 @@ function sendAliveStatus(data, callback) {
    settings.getAll(function (error, result) {
        if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));

-        eventlog.getAllPaged(eventlog.ACTION_USER_LOGIN, null, 1, 1, function (error, loginEvents) {
+        mail.getAll(function (error, mailDomains) {
            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));

-            var backendSettings = {
-                dnsConfig: {
-                    provider: result[settings.DNS_CONFIG_KEY].provider,
-                    wildcard: result[settings.DNS_CONFIG_KEY].provider === 'manual' ? result[settings.DNS_CONFIG_KEY].wildcard : undefined
-                },
-                tlsConfig: {
-                    provider: result[settings.TLS_CONFIG_KEY].provider
-                },
-                backupConfig: {
-                    provider: result[settings.BACKUP_CONFIG_KEY].provider,
-                    hardlinks: !result[settings.BACKUP_CONFIG_KEY].noHardlinks
-                },
-                mailConfig: {
-                    enabled: result[settings.MAIL_CONFIG_KEY].enabled
-                },
-                mailRelay: {
-                    provider: result[settings.MAIL_RELAY_KEY].provider
-                },
-                mailCatchAll: {
-                    count: result[settings.CATCH_ALL_ADDRESS_KEY].length
-                },
-                autoupdatePattern: result[settings.AUTOUPDATE_PATTERN_KEY],
-                timeZone: result[settings.TIME_ZONE_KEY],
-            };
+            eventlog.getAllPaged(eventlog.ACTION_USER_LOGIN, null, 1, 1, function (error, loginEvents) {
+                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));

-            var data = {
-                domain: config.fqdn(),
-                version: config.version(),
-                adminFqdn: config.adminFqdn(),
-                provider: config.provider(),
-                backendSettings: backendSettings,
-                machine: {
-                    cpus: os.cpus(),
-                    totalmem: os.totalmem()
-                },
-                events: {
-                    lastLogin: loginEvents[0] ? (new Date(loginEvents[0].creationTime).getTime()) : 0
-                }
-            };
+                var backendSettings = {
+                    backupConfig: {
+                        provider: result[settings.BACKUP_CONFIG_KEY].provider,
+                        hardlinks: !result[settings.BACKUP_CONFIG_KEY].noHardlinks
+                    },
+                    domainConfig: {
+                        count: mailDomains.length
+                    },
+                    mailConfig: {
+                        outboundCount: mailDomains.length,
+                        inboundCount: mailDomains.filter(function (d) { return d.enabled; }).length,
+                        catchAllCount: mailDomains.filter(function (d) { return d.catchAll.length !== 0; }).length,
+                        relayProviders: Array.from(new Set(mailDomains.map(function (d) { return d.relay.provider; })))
+                    },
+                    autoupdatePattern: result[settings.AUTOUPDATE_PATTERN_KEY],
+                    timeZone: result[settings.TIME_ZONE_KEY],
+                };

-            getAppstoreConfig(function (error, appstoreConfig) {
-                if (error) return callback(error);
+                var data = {
+                    version: config.version(),
+                    adminFqdn: config.adminFqdn(),
+                    provider: config.provider(),
+                    backendSettings: backendSettings,
+                    machine: {
+                        cpus: os.cpus(),
+                        totalmem: os.totalmem()
+                    },
+                    events: {
+                        lastLogin: loginEvents[0] ? (new Date(loginEvents[0].creationTime).getTime()) : 0
+                    }
+                };

-                var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/alive';
-                superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
-                    if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-                    if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
-                    if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Sending alive status failed. %s %j', result.status, result.body)));
+                getAppstoreConfig(function (error, appstoreConfig) {
+                    if (error) return callback(error);

-                    callback(null);
+                    var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/alive';
+                    superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
+                        if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+                        if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
+                        if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Sending alive status failed. %s %j', result.status, result.body)));
+
+                        callback(null);
+                    });
                });
            });
        });
@@ -222,10 +212,16 @@ function getBoxUpdate(callback) {
        superagent.get(url).query({ accessToken: appstoreConfig.token, boxVersion: config.version() }).timeout(10 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
            if (result.statusCode === 204) return callback(null); // no update
-            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+            if (result.statusCode !== 200 || !result.body) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+
+            var updateInfo = result.body;
+
+            if (!semver.valid(updateInfo.version) || semver.gt(config.version(), updateInfo.version)) {
+                return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+            }

            // { version, changelog, upgrade, sourceTarballUrl}
-            callback(null, result.body);
+            callback(null, updateInfo);
        });
    });
 }
@@ -242,10 +238,18 @@ function getAppUpdate(app, callback) {
        superagent.get(url).query({ accessToken: appstoreConfig.token, boxVersion: config.version(), appId: app.appStoreId, appVersion: app.manifest.version }).timeout(10 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
            if (result.statusCode === 204) return callback(null); // no update
-            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+            if (result.statusCode !== 200 || !result.body) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+
+            const updateInfo = result.body;
+
+            // do some sanity checks
+            if (!safe.query(updateInfo, 'manifest.version') || semver.gt(app.manifest.version, safe.query(updateInfo, 'manifest.version'))) {
+                debug('Skipping malformed update of app %s version: %s. got %j', app.id, app.manifest.version, updateInfo);
+                return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Malformed update: %s %s', result.statusCode, result.text)));
+            }

            // { id, creationDate, manifest }
-            callback(null, result.body);
+            callback(null, updateInfo);
        });
    });
 }
@@ -267,3 +271,26 @@ function getAccount(callback) {
        });
    });
 }
+
+function sendFeedback(info, callback) {
+    assert.strictEqual(typeof info, 'object');
+    assert.strictEqual(typeof info.email, 'string');
+    assert.strictEqual(typeof info.displayName, 'string');
+    assert.strictEqual(typeof info.type, 'string');
+    assert.strictEqual(typeof info.subject, 'string');
+    assert.strictEqual(typeof info.description, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    getAppstoreConfig(function (error, appstoreConfig) {
+        if (error) return callback(error);
+
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/feedback';
+
+        superagent.post(url).query({ accessToken: appstoreConfig.token }).send(info).timeout(10 * 1000).end(function (error, result) {
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+
+            callback(null);
+        });
+    });
+}
@@ -8,8 +8,8 @@ exports = module.exports = {

    // exported for testing
    _reserveHttpPort: reserveHttpPort,
-    _configureNginx: configureNginx,
-    _unconfigureNginx: unconfigureNginx,
+    _configureReverseProxy: configureReverseProxy,
+    _unconfigureReverseProxy: unconfigureReverseProxy,
    _createVolume: createVolume,
    _deleteVolume: deleteVolume,
    _verifyManifest: verifyManifest,
@@ -32,24 +32,23 @@ var addons = require('./addons.js'),
    assert = require('assert'),
    async = require('async'),
    backups = require('./backups.js'),
-    certificates = require('./certificates.js'),
    config = require('./config.js'),
    database = require('./database.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:apptask'),
    docker = require('./docker.js'),
+    domains = require('./domains.js'),
+    DomainError = domains.DomainError,
    ejs = require('ejs'),
    fs = require('fs'),
    manifestFormat = require('cloudron-manifestformat'),
    net = require('net'),
-    nginx = require('./nginx.js'),
    os = require('os'),
    path = require('path'),
    paths = require('./paths.js'),
+    reverseProxy = require('./reverseproxy.js'),
    safe = require('safetydance'),
    shell = require('./shell.js'),
-    SubdomainError = require('./subdomains.js').SubdomainError,
-    subdomains = require('./subdomains.js'),
    superagent = require('superagent'),
    sysinfo = require('./sysinfo.js'),
    tld = require('tldjs'),
@@ -72,10 +71,29 @@ function initialize(callback) {
 function debugApp(app) {
    assert.strictEqual(typeof app, 'object');

-    var prefix = app ? (app.location || '(bare)') : '(no app)';
+    var prefix = app ? (app.intrinsicFqdn || '(bare)') : '(no app)';
    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }

+// updates the app object and the database
+function updateApp(app, values, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof values, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    debugApp(app, 'updating app with values: %j', values);
+
+    appdb.update(app.id, values, function (error) {
+        if (error) return callback(error);
+
+        for (var value in values) {
+            app[value] = values[value];
+        }
+
+        return callback(null);
+    });
+}
+
 function reserveHttpPort(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -94,23 +112,19 @@ function reserveHttpPort(app, callback) {
    });
 }

-function configureNginx(app, callback) {
+function configureReverseProxy(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    certificates.ensureCertificate(app, function (error, certFilePath, keyFilePath) {
-        if (error) return callback(error);
-
-        nginx.configureApp(app, certFilePath, keyFilePath, callback);
-    });
+    reverseProxy.configureApp(app, { userId: null, username: 'apptask' }, callback);
 }

-function unconfigureNginx(app, callback) {
+function unconfigureReverseProxy(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

    // TODO: maybe revoke the cert
-    nginx.unconfigureApp(app, callback);
+    reverseProxy.unconfigureApp(app, callback);
 }

 function createContainer(app, callback) {
@@ -252,18 +266,17 @@ function registerSubdomain(app, overwrite, callback) {
        if (error) return callback(error);

        async.retry({ times: 200, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.location, overwrite);
+            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.intrinsicFqdn, overwrite);

            // get the current record before updating it
-            subdomains.get(app.location, 'A', function (error, values) {
+            domains.getDNSRecords(app.location, app.domain, 'A', function (error, values) {
                if (error) return retryCallback(error);

                // refuse to update any existing DNS record for custom domains that we did not create
-                // note that the appstore sets up the naked domain for non-custom domains
-                if (config.isCustomDomain() && values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));
+                if (values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));

-                subdomains.upsert(app.location, 'A', [ ip ], function (error, changeId) {
-                    if (error && (error.reason === SubdomainError.STILL_BUSY || error.reason === SubdomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+                domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], function (error, changeId) {
+                    if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again

                    retryCallback(null, error || changeId);
                });
@@ -277,17 +290,12 @@ function registerSubdomain(app, overwrite, callback) {
    });
 }

-function unregisterSubdomain(app, location, callback) {
+function unregisterSubdomain(app, location, domain, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    // do not unregister bare domain because we show a error/cloudron info page there
-    if (!config.isCustomDomain() && location === '') {
-        debugApp(app, 'Skip unregister of empty subdomain');
-        return callback(null);
-    }
-
    if (!app.dnsRecordId) {
        debugApp(app, 'Skip unregister of record not created by cloudron');
        return callback(null);
@@ -297,10 +305,11 @@ function unregisterSubdomain(app, location, callback) {
        if (error) return callback(error);

        async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Unregistering subdomain: %s', location);
+            debugApp(app, 'Unregistering subdomain: %s', app.intrinsicFqdn);

-            subdomains.remove(location, 'A', [ ip ], function (error) {
-                if (error && (error.reason === SubdomainError.STILL_BUSY || error.reason === SubdomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+            domains.removeDNSRecords(location, domain, 'A', [ ip ], function (error) {
+                if (error && error.reason === DomainError.NOT_FOUND) return retryCallback(null, null); // domain can be not found if oldConfig.domain or restoreConfig.domain was removed
+                if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again

                retryCallback(null, error);
            });
@@ -334,7 +343,7 @@ function waitForDnsPropagation(app, callback) {
    sysinfo.getPublicIp(function (error, ip) {
        if (error) return callback(error);

-        subdomains.waitForDns(config.appFqdn(app.location), ip, 'A', { interval: 5000, times: 120 }, callback);
+        domains.waitForDNSRecord(app.intrinsicFqdn, app.domain, ip, 'A', { interval: 5000, times: 120 }, callback);
    });
 }

@@ -348,32 +357,13 @@ function waitForAltDomainDnsPropagation(app, callback) {
        sysinfo.getPublicIp(function (error, ip) {
            if (error) return callback(error);

-            subdomains.waitForDns(app.altDomain, ip, 'A', { interval: 10000, times: 60 }, callback);
+            domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), ip, 'A', { interval: 10000, times: 60 }, callback);
        });
    } else {
-        subdomains.waitForDns(app.altDomain, config.appFqdn(app.location) + '.', 'CNAME', { interval: 10000, times: 60 }, callback);
+        domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), app.intrinsicFqdn + '.', 'CNAME', { interval: 10000, times: 60 }, callback);
    }
 }

-// updates the app object and the database
-function updateApp(app, values, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof values, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    debugApp(app, 'updating app with values: %j', values);
-
-    appdb.update(app.id, values, function (error) {
-        if (error) return callback(error);
-
-        for (var value in values) {
-            app[value] = values[value];
-        }
-
-        return callback(null);
-    });
-}
-
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.
@@ -389,7 +379,7 @@ function install(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    const backupId = app.lastBackupId, isRestoring = app.installationState === appdb.ISTATE_PENDING_RESTORE;
+    const restoreConfig = app.restoreConfig, isRestoring = app.installationState === appdb.ISTATE_PENDING_RESTORE;

    async.series([
        // this protects against the theoretical possibility of an app being marked for install/restore from
@@ -398,7 +388,7 @@ function install(app, callback) {

        // teardown for re-installs
        updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
-        unconfigureNginx.bind(null, app),
+        unconfigureReverseProxy.bind(null, app),
        removeCollectdProfile.bind(null, app),
        removeLogrotateConfig.bind(null, app),
        stopApp.bind(null, app),
@@ -429,7 +419,7 @@ function install(app, callback) {
        createVolume.bind(null, app),

        function restoreFromBackup(next) {
-            if (!backupId) {
+            if (!restoreConfig) {
                async.series([
                    updateApp.bind(null, app, { installationProgress: '60, Setting up addons' }),
                    addons.setupAddons.bind(null, app, app.manifest.addons),
@@ -437,7 +427,7 @@ function install(app, callback) {
            } else {
                async.series([
                    updateApp.bind(null, app, { installationProgress: '60, Download backup and restoring addons' }),
-                    backups.restoreApp.bind(null, app, app.manifest.addons, backupId),
+                    backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig),
                ], next);
            }
        },
@@ -457,10 +447,10 @@ function install(app, callback) {
        exports._waitForDnsPropagation.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '90, Waiting for External Domain setup' }),
-        exports._waitForAltDomainDnsPropagation.bind(null, app), // required when restoring and !lastBackupId
+        exports._waitForAltDomainDnsPropagation.bind(null, app), // required when restoring and !restoreConfig

-        updateApp.bind(null, app, { installationProgress: '95, Configure nginx' }),
-        configureNginx.bind(null, app),
+        updateApp.bind(null, app, { installationProgress: '95, Configuring reverse proxy' }),
+        configureReverseProxy.bind(null, app),

        // done!
        function (callback) {
@@ -482,7 +472,7 @@ function backup(app, callback) {

    async.series([
        updateApp.bind(null, app, { installationProgress: '10, Backing up' }),
-        backups.backupApp.bind(null, app, app.manifest),
+        backups.backupApp.bind(null, app),

        // done!
        function (callback) {
@@ -504,18 +494,19 @@ function configure(app, callback) {
    assert.strictEqual(typeof callback, 'function');

    // oldConfig can be null during an infra update
-    var locationChanged = app.oldConfig && app.oldConfig.location !== app.location;
+    var locationChanged = app.oldConfig && (app.oldConfig.intrinsicFqdn !== app.intrinsicFqdn);

    async.series([
        updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
-        unconfigureNginx.bind(null, app),
+        unconfigureReverseProxy.bind(null, app),
        removeCollectdProfile.bind(null, app),
        removeLogrotateConfig.bind(null, app),
        stopApp.bind(null, app),
        deleteContainers.bind(null, app),
        function (next) {
            if (!locationChanged) return next();
-            unregisterSubdomain(app, app.oldConfig.location, next);
+
+            unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain, next);
        },

        reserveHttpPort.bind(null, app),
@@ -553,8 +544,8 @@ function configure(app, callback) {
        updateApp.bind(null, app, { installationProgress: '85, Waiting for External Domain setup' }),
        exports._waitForAltDomainDnsPropagation.bind(null, app),

-        updateApp.bind(null, app, { installationProgress: '90, Configuring Nginx' }),
-        configureNginx.bind(null, app),
+        updateApp.bind(null, app, { installationProgress: '90, Configuring reverse proxy' }),
+        configureReverseProxy.bind(null, app),

        // done!
        function (callback) {
@@ -575,31 +566,34 @@ function update(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    debugApp(app, `Updating to ${app.newConfig.manifest.version}`);
+    debugApp(app, `Updating to ${app.updateConfig.manifest.version}`);

    // app does not want these addons anymore
    // FIXME: this does not handle option changes (like multipleDatabases)
-    var unusedAddons = _.omit(app.manifest.addons, Object.keys(app.newConfig.manifest.addons));
+    var unusedAddons = _.omit(app.manifest.addons, Object.keys(app.updateConfig.manifest.addons));

    async.series([
        // this protects against the theoretical possibility of an app being marked for update from
        // a previous version of box code
        updateApp.bind(null, app, { installationProgress: '0, Verify manifest' }),
-        verifyManifest.bind(null, app.newConfig.manifest),
+        verifyManifest.bind(null, app.updateConfig.manifest),

        function (next) {
            if (app.installationState === appdb.ISTATE_PENDING_FORCE_UPDATE) return next(null);

            async.series([
                updateApp.bind(null, app, { installationProgress: '15, Backing up app' }),
-                backups.backupApp.bind(null, app, app.manifest)
-            ], next);
+                backups.backupApp.bind(null, app)
+            ], function (error) {
+                if (error) error.backupError = true;
+                next(error);
+            });
        },

        // download new image before app is stopped. this is so we can reduce downtime
        // and also not remove the 'common' layers when the old image is deleted
        updateApp.bind(null, app, { installationProgress: '25, Downloading image' }),
-        docker.downloadImage.bind(null, app.newConfig.manifest),
+        docker.downloadImage.bind(null, app.updateConfig.manifest),

        // note: we cleanup first and then backup. this is done so that the app is not running should backup fail
        // we cannot easily 'recover' from backup failures because we have to revert manfest and portBindings
@@ -609,7 +603,7 @@ function update(app, callback) {
        stopApp.bind(null, app),
        deleteContainers.bind(null, app),
        function deleteImageIfChanged(done) {
-            if (app.manifest.dockerImage === app.newConfig.manifest.dockerImage) return done();
+            if (app.manifest.dockerImage === app.updateConfig.manifest.dockerImage) return done();

            docker.deleteImage(app.manifest, done);
        },
@@ -621,7 +615,7 @@ function update(app, callback) {
        function (next) {
            // make sure we always have objects
            var currentPorts = app.portBindings || {};
-            var newPorts = app.newConfig.manifest.tcpPorts || {};
+            var newPorts = app.updateConfig.manifest.tcpPorts || {};

            async.each(Object.keys(currentPorts), function (portName, callback) {
                if (newPorts[portName]) return callback(); // port still in use
@@ -639,13 +633,13 @@ function update(app, callback) {
        },

        // switch over to the new config. manifest, memoryLimit, portBindings, appstoreId are updated here
-        updateApp.bind(null, app, app.newConfig),
+        updateApp.bind(null, app, app.updateConfig),

        updateApp.bind(null, app, { installationProgress: '45, Downloading icon' }),
        downloadIcon.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '70, Updating addons' }),
-        addons.setupAddons.bind(null, app, app.manifest.addons),
+        addons.setupAddons.bind(null, app, app.updateConfig.manifest.addons),

        updateApp.bind(null, app, { installationProgress: '80, Creating container' }),
        createContainer.bind(null, app),
@@ -661,14 +655,18 @@ function update(app, callback) {
        // done!
        function (callback) {
            debugApp(app, 'updated');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, newConfig: null }, callback);
+            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null, updateTime: new Date() }, callback);
        }
    ], function seriesDone(error) {
-        if (error) {
+        if (error && error.backupError) {
+            debugApp(app, 'update aborted because backup failed', error);
+            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null }, callback.bind(null, error));
+        } else if (error) {
            debugApp(app, 'Error updating app: %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, callback.bind(null, error));
+            updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message, updateTime: new Date() }, callback.bind(null, error));
+        } else {
+            callback(null);
        }
-        callback(null);
    });
 }

@@ -701,13 +699,13 @@ function uninstall(app, callback) {
        docker.deleteImage.bind(null, app.manifest),

        updateApp.bind(null, app, { installationProgress: '60, Unregistering subdomain' }),
-        unregisterSubdomain.bind(null, app, app.location),
+        unregisterSubdomain.bind(null, app, app.location, app.domain),

        updateApp.bind(null, app, { installationProgress: '80, Cleanup icon' }),
        removeIcon.bind(null, app),

-        updateApp.bind(null, app, { installationProgress: '90, Unconfiguring Nginx' }),
-        unconfigureNginx.bind(null, app),
+        updateApp.bind(null, app, { installationProgress: '90, Unconfiguring reverse proxy' }),
+        unconfigureReverseProxy.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '95, Remove app from database' }),
        appdb.del.bind(null, app.id)
@@ -765,7 +763,7 @@ function startTask(appId, callback) {
    assert.strictEqual(typeof callback, 'function');

    // determine what to do
-    appdb.get(appId, function (error, app) {
+    apps.get(appId, function (error, app) {
        if (error) return callback(error);

        debugApp(app, 'startTask installationState: %s runState: %s', app.installationState, app.runState);
@@ -25,22 +25,22 @@ var assert = require('assert'),

 function initialize(callback) {
    assert.strictEqual(typeof callback, 'function');
-    
+
    passport.serializeUser(function (user, callback) {
        callback(null, user.id);
    });
-    
+
    passport.deserializeUser(function(userId, callback) {
        user.get(userId, function (error, result) {
            if (error) return callback(error);
-            
-            var md5 = crypto.createHash('md5').update(result.alternateEmail || result.email).digest('hex');
+
+            var md5 = crypto.createHash('md5').update(result.email).digest('hex');
            result.gravatar = 'https://www.gravatar.com/avatar/' + md5 + '.jpg?s=24&d=mm';
-            
+
            callback(null, result);
        });
    });
-    
+
    passport.use(new LocalStrategy(function (username, password, callback) {
        if (username.indexOf('@') === -1) {
            user.verifyWithUsername(username, password, function (error, result) {
@@ -60,7 +60,7 @@ function initialize(callback) {
            });
        }
    }));
-    
+
    passport.use(new BasicStrategy(function (username, password, callback) {
        if (username.indexOf('cid-') === 0) {
            debug('BasicStrategy: detected client id %s instead of username:password', username);
@@ -82,7 +82,7 @@ function initialize(callback) {
            });
        }
    }));
-    
+
    passport.use(new ClientPasswordStrategy(function (clientId, clientSecret, callback) {
        clients.get(clientId, function(error, client) {
            if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
@@ -91,15 +91,15 @@ function initialize(callback) {
            return callback(null, client);
        });
    }));
-    
+
    passport.use(new BearerStrategy(accessTokenAuth));
-    
+
    callback(null);
 }

 function uninitialize(callback) {
    assert.strictEqual(typeof callback, 'function');
-    
+
    callback(null);
 }

@@ -110,15 +110,15 @@ function accessTokenAuth(accessToken, callback) {
    tokendb.get(accessToken, function (error, token) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, false);
        if (error) return callback(error);
-        
+
        // scopes here can define what capabilities that token carries
        // passport put the 'info' object into req.authInfo, where we can further validate the scopes
        var info = { scope: token.scope };
-        
+
        user.get(token.identifier, function (error, user) {
            if (error && error.reason === UserError.NOT_FOUND) return callback(null, false);
            if (error) return callback(error);
-            
+
            callback(null, user, info);
        });
    });
@@ -6,7 +6,7 @@ var assert = require('assert'),
    safe = require('safetydance'),
    util = require('util');

-var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'restoreConfigJson', 'format' ];
+var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'manifestJson', 'format' ];

 exports = module.exports = {
    add: add,
@@ -34,8 +34,8 @@ function postProcess(result) {

    result.dependsOn = result.dependsOn ? result.dependsOn.split(',') : [ ];

-    result.restoreConfig = result.restoreConfigJson ? safe.JSON.parse(result.restoreConfigJson) : null;
-    delete result.restoreConfigJson;
+    result.manifest = result.manifestJson ? safe.JSON.parse(result.manifestJson) : null;
+    delete result.manifestJson;
 }

 function getByTypeAndStatePaged(type, state, page, perPage, callback) {
@@ -109,15 +109,15 @@ function add(backup, callback) {
    assert.strictEqual(typeof backup.version, 'string');
    assert(backup.type === exports.BACKUP_TYPE_APP || backup.type === exports.BACKUP_TYPE_BOX);
    assert(util.isArray(backup.dependsOn));
-    assert.strictEqual(typeof backup.restoreConfig, 'object');
+    assert.strictEqual(typeof backup.manifest, 'object');
    assert.strictEqual(typeof backup.format, 'string');
    assert.strictEqual(typeof callback, 'function');

    var creationTime = backup.creationTime || new Date(); // allow tests to set the time
-    var restoreConfig = backup.restoreConfig ? JSON.stringify(backup.restoreConfig) : '';
+    var manifestJson = JSON.stringify(backup.manifest);

-    database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, restoreConfigJson, format) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
-        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), restoreConfig, backup.format ],
+    database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, manifestJson, format) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), manifestJson, backup.format ],
        function (error) {
            if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
@@ -8,18 +8,19 @@ exports = module.exports = {
    getByStatePaged: getByStatePaged,
    getByAppIdPaged: getByAppIdPaged,

-    getRestoreConfig: getRestoreConfig,
+    get: get,

    ensureBackup: ensureBackup,

    backup: backup,
+    restore: restore,
+
    backupApp: backupApp,
    restoreApp: restoreApp,

    backupBoxAndApps: backupBoxAndApps,

    upload: upload,
-    download: download,

    cleanup: cleanup,
    cleanupCacheFilesSync: cleanupCacheFilesSync,
@@ -41,6 +42,7 @@ var addons = require('./addons.js'),
    backupdb = require('./backupdb.js'),
    config = require('./config.js'),
    crypto = require('crypto'),
+    database = require('./database.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:backups'),
    eventlog = require('./eventlog.js'),
@@ -68,7 +70,7 @@ var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
 function debugApp(app) {
    assert(!app || typeof app === 'object');

-    var prefix = app ? app.location : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }

@@ -102,6 +104,7 @@ function api(provider) {
    switch (provider) {
    case 'caas': return require('./storage/s3.js');
    case 's3': return require('./storage/s3.js');
+    case 'gcs': return require('./storage/gcs.js');
    case 'filesystem': return require('./storage/filesystem.js');
    case 'minio': return require('./storage/s3.js');
    case 's3-v4-compat': return require('./storage/s3.js');
@@ -150,16 +153,15 @@ function getByAppIdPaged(page, perPage, appId, callback) {
    });
 }

-function getRestoreConfig(backupId, callback) {
+function get(backupId, callback) {
    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof callback, 'function');

    backupdb.get(backupId, function (error, result) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND, error));
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-        if (!result.restoreConfig)  return callback(new BackupsError(BackupsError.NOT_FOUND, error));

-        callback(null, result.restoreConfig);
+        callback(null, result);
    });
 }

@@ -369,8 +371,10 @@ function restoreFsMetadata(appDataDir, callback) {

    log('Recreating empty directories');

-    var metadata = safe.JSON.parse(safe.fs.readFileSync(path.join(appDataDir, 'fsmetadata.json'), 'utf8'));
-    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.txt:' + safe.error.message));
+    var metadataJson = safe.fs.readFileSync(path.join(appDataDir, 'fsmetadata.json'), 'utf8');
+    if (metadataJson === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.txt:' + safe.error.message));
+    var metadata = safe.JSON.parse(metadataJson);
+    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error parsing fsmetadata.txt:' + safe.error.message));

    async.eachSeries(metadata.emptyDirs, function createPath(emptyDir, iteratorDone) {
        mkdirp(path.join(appDataDir, emptyDir), iteratorDone);
@@ -387,7 +391,8 @@ function restoreFsMetadata(appDataDir, callback) {
    });
 }

-function download(backupId, format, dataDir, callback) {
+function download(backupConfig, backupId, format, dataDir, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof format, 'string');
    assert.strictEqual(typeof dataDir, 'string');
@@ -397,44 +402,54 @@ function download(backupId, format, dataDir, callback) {

    log(`Downloading ${backupId} of format ${format} to ${dataDir}`);

-    settings.getBackupConfig(function (error, backupConfig) {
-        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+    if (format === 'tgz') {
+        api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
+            if (error) return callback(error);

-        if (format === 'tgz') {
-            api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
-                if (error) return callback(error);
+            tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
+        });
+    } else {
+        var events = api(backupConfig.provider).downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir);
+        events.on('progress', log);
+        events.on('done', function (error) {
+            if (error) return callback(error);

-                tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
-            });
-        } else {
-            var events = api(backupConfig.provider).downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir);
-            events.on('progress', log);
-            events.on('done', function (error) {
-                if (error) return callback(error);
+            restoreFsMetadata(dataDir, callback);
+        });
+    }
+}

-                restoreFsMetadata(dataDir, callback);
-            });
-        }
+function restore(backupConfig, backupId, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    download(backupConfig, backupId, backupConfig.format, paths.BOX_DATA_DIR, function (error) {
+        if (error) return callback(error);
+
+        database.importFromFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) {
+            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+            callback();
+        });
    });
 }

-function restoreApp(app, addonsToRestore, backupId, callback) {
+function restoreApp(app, addonsToRestore, restoreConfig, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof addonsToRestore, 'object');
-    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof restoreConfig, 'object');
    assert.strictEqual(typeof callback, 'function');
-    assert(app.lastBackupId);

    var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));

    var startTime = new Date();

-    backupdb.get(backupId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND, error));
+    settings.getBackupConfig(function (error, backupConfig) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        async.series([
-            download.bind(null, backupId, result.format, appDataDir),
+            download.bind(null, backupConfig, restoreConfig.backupId, restoreConfig.backupFormat, appDataDir),
            addons.restoreAddons.bind(null, app, addonsToRestore)
        ], function (error) {
            debug('restoreApp: time: %s', (new Date() - startTime)/1000);
@@ -512,13 +527,7 @@ function snapshotBox(callback) {

    log('Snapshotting box');

-    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
-    var mysqlDumpArgs = [
-        '-c',
-        `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
-            --triggers ${config.database().name} > "${paths.BOX_DATA_DIR}/box.mysqldump"`
-    ];
-    shell.exec('backupBox', '/bin/bash', mysqlDumpArgs, { }, function (error) {
+    database.exportToFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        return callback();
@@ -559,7 +568,7 @@ function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {

    log(`Rotating box backup to id ${backupId}`);

-    backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, restoreConfig: null, format: format }, function (error) {
+    backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, 'snapshot/box', format), getBackupFilePath(backupConfig, backupId, format));
@@ -609,36 +618,19 @@ function canBackupApp(app) {
            app.installationState === appdb.ISTATE_PENDING_UPDATE; // called from apptask
 }

-function snapshotApp(app, manifest, callback) {
+function snapshotApp(app, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
    assert.strictEqual(typeof callback, 'function');

    log(`Snapshotting app ${app.id}`);

-    var restoreConfig = apps.getAppConfig(app);
-    restoreConfig.manifest = manifest;
-
-    if (!safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'), JSON.stringify(restoreConfig))) {
+    if (!safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'), JSON.stringify(apps.getAppConfig(app)))) {
        return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error creating config.json: ' + safe.error.message));
    }

-    addons.backupAddons(app, manifest.addons, function (error) {
+    addons.backupAddons(app, app.manifest.addons, function (error) {
        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));

-        return callback(null, restoreConfig);
-    });
-}
-
-function setRestorePoint(appId, lastBackupId, callback) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof lastBackupId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    appdb.update(appId, { lastBackupId: lastBackupId }, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND, 'No such app'));
-        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
        return callback(null);
    });
 }
@@ -653,14 +645,13 @@ function rotateAppBackup(backupConfig, app, timestamp, callback) {
    if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));

    var snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,'');
-    var restoreConfig = snapshotInfo.restoreConfig;
-    var manifest = restoreConfig.manifest;
+    var manifest = snapshotInfo.restoreConfig ? snapshotInfo.restoreConfig.manifest : snapshotInfo.manifest; // compat
    var backupId = util.format('%s/app_%s_%s_v%s', timestamp, app.id, snapshotTime, manifest.version);
    const format = backupConfig.format;

    log(`Rotating app backup of ${app.id} to id ${backupId}`);

-    backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], restoreConfig: restoreConfig, format: format }, function (error) {
+    backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], manifest: manifest, format: format }, function (error) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, `snapshot/app_${app.id}`, format), getBackupFilePath(backupConfig, backupId, format));
@@ -674,27 +665,22 @@ function rotateAppBackup(backupConfig, app, timestamp, callback) {

                log(`Rotated app backup of ${app.id} successfully to id ${backupId}`);

-                setRestorePoint(app.id, backupId, function (error) {
-                    if (error) return callback(error);
-
-                    return callback(null, backupId);
-                });
+                callback(null, backupId);
            });
        });
    });
 }

-function uploadAppSnapshot(backupConfig, app, manifest, callback) {
+function uploadAppSnapshot(backupConfig, app, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
    assert.strictEqual(typeof callback, 'function');

    if (!canBackupApp(app)) return callback(); // nothing to do

    var startTime = new Date();

-    snapshotApp(app, manifest, function (error, restoreConfig) {
+    snapshotApp(app, function (error) {
        if (error) return callback(error);

        var backupId = util.format('snapshot/app_%s', app.id);
@@ -704,14 +690,13 @@ function uploadAppSnapshot(backupConfig, app, manifest, callback) {

            debugApp(app, 'uploadAppSnapshot: %s done time: %s secs', backupId, (new Date() - startTime)/1000);

-            setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), restoreConfig: restoreConfig, format: backupConfig.format }, callback);
+            setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), manifest: app.manifest, format: backupConfig.format }, callback);
        });
    });
 }

-function backupAppWithTimestamp(app, manifest, timestamp, callback) {
+function backupAppWithTimestamp(app, timestamp, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
    assert.strictEqual(typeof timestamp, 'string');
    assert.strictEqual(typeof callback, 'function');

@@ -720,7 +705,7 @@ function backupAppWithTimestamp(app, manifest, timestamp, callback) {
    settings.getBackupConfig(function (error, backupConfig) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

-        uploadAppSnapshot(backupConfig, app, manifest, function (error) {
+        uploadAppSnapshot(backupConfig, app, function (error) {
            if (error) return callback(error);

            rotateAppBackup(backupConfig, app, timestamp, callback);
@@ -728,17 +713,16 @@ function backupAppWithTimestamp(app, manifest, timestamp, callback) {
    });
 }

-function backupApp(app, manifest, callback) {
+function backupApp(app, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
    assert.strictEqual(typeof callback, 'function');

    const timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
    safe.fs.unlinkSync(paths.BACKUP_LOG_FILE); // start fresh log file

-    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
+    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || app.intrinsicFqdn));

-    backupAppWithTimestamp(app, manifest, timestamp, function (error) {
+    backupAppWithTimestamp(app, timestamp, function (error) {
        progress.set(progress.BACKUP, 100, error ? error.message : '');

        callback(error);
@@ -763,22 +747,22 @@ function backupBoxAndApps(auditSource, callback) {
        var step = 100/(allApps.length+2);

        async.mapSeries(allApps, function iterator(app, iteratorCallback) {
-            progress.set(progress.BACKUP, step * processed,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
+            progress.set(progress.BACKUP, step * processed,  'Backing up ' + (app.altDomain || app.intrinsicFqdn));

            ++processed;

            if (!app.enableBackup) {
-                progress.set(progress.BACKUP, step * processed, 'Skipped backup ' + (app.altDomain || config.appFqdn(app.location)));
-                return iteratorCallback(null, app.lastBackupId); // just use the last backup
+                progress.set(progress.BACKUP, step * processed, 'Skipped backup ' + (app.altDomain || app.intrinsicFqdn));
+                return iteratorCallback(null, null); // nothing to backup
            }

-            backupAppWithTimestamp(app, app.manifest, timestamp, function (error, backupId) {
+            backupAppWithTimestamp(app, timestamp, function (error, backupId) {
                if (error && error.reason !== BackupsError.BAD_STATE) {
                    debugApp(app, 'Unable to backup', error);
                    return iteratorCallback(error);
                }

-                progress.set(progress.BACKUP, step * processed, 'Backed up ' + (app.altDomain || config.appFqdn(app.location)));
+                progress.set(progress.BACKUP, step * processed, 'Backed up ' + (app.altDomain || app.intrinsicFqdn));

                iteratorCallback(null, backupId || null); // clear backupId if is in BAD_STATE and never backed up
            });
@@ -857,7 +841,7 @@ function cleanupBackup(backupConfig, backup, callback) {
    function done(error) {
        if (error) {
            debug('cleanupBackup: error removing backup %j : %s', backup, error.message);
-            callback();
+            return callback();
        }

        // prune empty directory if possible
@@ -1029,3 +1013,4 @@ function cleanup(auditSource, callback) {
        });
    });
 }
+
@@ -0,0 +1,266 @@
+'use strict';
+
+exports = module.exports = {
+    verifySetupToken: verifySetupToken,
+    setupDone: setupDone,
+
+    changePlan: changePlan,
+    upgrade: upgrade,
+    sendHeartbeat: sendHeartbeat,
+    getBoxAndUserDetails: getBoxAndUserDetails,
+    setPtrRecord: setPtrRecord,
+
+    CaasError: CaasError
+};
+
+var assert = require('assert'),
+    backups = require('./backups.js'),
+    config = require('./config.js'),
+    debug = require('debug')('box:caas'),
+    locker = require('./locker.js'),
+    path = require('path'),
+    progress = require('./progress.js'),
+    settings = require('./settings.js'),
+    shell = require('./shell.js'),
+    superagent = require('superagent'),
+    util = require('util'),
+    _ = require('underscore');
+
+const RETIRE_CMD = path.join(__dirname, 'scripts/retire.sh');
+
+function CaasError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(CaasError, Error);
+CaasError.BAD_FIELD = 'Field error';
+CaasError.BAD_STATE = 'Bad state';
+CaasError.INVALID_TOKEN = 'Invalid Token';
+CaasError.INTERNAL_ERROR = 'Internal Error';
+CaasError.EXTERNAL_ERROR = 'External Error';
+
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function retire(reason, info, callback) {
+    assert(reason === 'migrate' || reason === 'upgrade');
+    info = info || { };
+    callback = callback || NOOP_CALLBACK;
+
+    var data = {
+        apiServerOrigin: config.apiServerOrigin(),
+        adminFqdn: config.adminFqdn()
+    };
+    shell.sudo('retire', [ RETIRE_CMD, reason, JSON.stringify(info), JSON.stringify(data) ], callback);
+}
+
+function getCaasConfig(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, result) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        callback(null, result);
+    });
+}
+
+function verifySetupToken(setupToken, callback) {
+    assert.strictEqual(typeof setupToken, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, caasConfig) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        superagent.get(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId + '/setup/verify').query({ setupToken: setupToken })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+                if (result.statusCode === 403) return callback(new CaasError(CaasError.INVALID_TOKEN));
+                if (result.statusCode === 409) return callback(new CaasError(CaasError.BAD_STATE, 'Already setup'));
+                if (result.statusCode !== 200) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+
+                callback(null);
+            });
+    });
+}
+
+function setupDone(setupToken, callback) {
+    assert.strictEqual(typeof setupToken, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, caasConfig) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        // Now let the api server know we got activated
+        superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId + '/setup/done').query({ setupToken: setupToken })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+                if (result.statusCode === 403) return callback(new CaasError(CaasError.INVALID_TOKEN));
+                if (result.statusCode === 409) return callback(new CaasError(CaasError.BAD_STATE, 'Already setup'));
+                if (result.statusCode !== 201) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+
+                callback(null);
+            });
+    });
+}
+function doMigrate(options, caasConfig, callback) {
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof caasConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var error = locker.lock(locker.OP_MIGRATE);
+    if (error) return callback(new CaasError(CaasError.BAD_STATE, error.message));
+
+    function unlock(error) {
+        debug('Failed to migrate', error);
+        locker.unlock(locker.OP_MIGRATE);
+        progress.set(progress.MIGRATE, -1, 'Backup failed: ' + error.message);
+    }
+
+    progress.set(progress.MIGRATE, 10, 'Backing up for migration');
+
+    // initiate the migration in the background
+    backups.backupBoxAndApps({ userId: null, username: 'migrator' }, function (error) {
+        if (error) return unlock(error);
+
+        debug('migrate: domain: %s size %s region %s', options.domain, options.size, options.region);
+
+        superagent
+            .post(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId + '/migrate')
+            .query({ token: caasConfig.token })
+            .send(options)
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return unlock(error); // network error
+                if (result.statusCode === 409) return unlock(new CaasError(CaasError.BAD_STATE));
+                if (result.statusCode === 404) return unlock(new CaasError(CaasError.NOT_FOUND));
+                if (result.statusCode !== 202) return unlock(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
+
+                progress.set(progress.MIGRATE, 10, 'Migrating');
+
+                retire('migrate', _.pick(options, 'domain', 'size', 'region'));
+            });
+    });
+
+    callback(null);
+}
+
+function changePlan(options, callback) {
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (config.isDemo()) return callback(new CaasError(CaasError.BAD_FIELD, 'Not allowed in demo mode'));
+
+    getCaasConfig(function (error, result) {
+        if (error) return callback(error);
+
+        doMigrate(options, result, callback);
+    });
+}
+
+// this function expects a lock
+function upgrade(boxUpdateInfo, callback) {
+    assert(boxUpdateInfo !== null && typeof boxUpdateInfo === 'object');
+
+    function upgradeError(e) {
+        progress.set(progress.UPDATE, -1, e.message);
+        callback(e);
+    }
+
+    progress.set(progress.UPDATE, 5, 'Backing up for upgrade');
+
+    backups.backupBoxAndApps({ userId: null, username: 'upgrader' }, function (error) {
+        if (error) return upgradeError(error);
+
+        getCaasConfig(function (error, result) {
+            if (error) return upgradeError(error);
+
+            superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + result.boxId + '/upgrade')
+                .query({ token: result.token })
+                .send({ version: boxUpdateInfo.version })
+                .timeout(30 * 1000)
+                .end(function (error, result) {
+                    if (error && !error.response) return upgradeError(new Error('Network error making upgrade request: ' + error));
+                    if (result.statusCode !== 202) return upgradeError(new Error(util.format('Server not ready to upgrade. statusCode: %s body: %j', result.status, result.body)));
+
+                    progress.set(progress.UPDATE, 10, 'Updating base system');
+
+                    // no need to unlock since this is the last thing we ever do on this box
+                    callback();
+
+                    retire('upgrade');
+                });
+        });
+    });
+}
+
+function sendHeartbeat() {
+    assert(config.provider() === 'caas', 'Heartbeat is only sent for managed cloudrons');
+
+    getCaasConfig(function (error, result) {
+        if (error) return debug('Caas config missing', error);
+
+        var url = config.apiServerOrigin() + '/api/v1/boxes/' + result.boxId + '/heartbeat';
+        superagent.post(url).query({ token: result.token, version: config.version() }).timeout(30 * 1000).end(function (error, result) {
+            if (error && !error.response) debug('Network error sending heartbeat.', error);
+            else if (result.statusCode !== 200) debug('Server responded to heartbeat with %s %s', result.statusCode, result.text);
+            else debug('Heartbeat sent to %s', url);
+        });
+    });
+}
+
+function getBoxAndUserDetails(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    if (config.provider() !== 'caas') return callback(null, {});
+
+    getCaasConfig(function (error, caasConfig) {
+        if (error) return callback(error);
+
+        superagent
+            .get(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId)
+            .query({ token: caasConfig.token })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, 'Cannot reach appstore'));
+                if (result.statusCode !== 200) return callback(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+
+                return callback(null, result.body);
+            });
+    });
+}
+
+function setPtrRecord(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    getCaasConfig(function (error, result) {
+        if (error) return callback(error);
+
+        superagent
+            .post(config.apiServerOrigin() + '/api/v1/boxes/' + result.boxId + '/ptr')
+            .query({ token: result.token })
+            .send({ domain: domain })
+            .timeout(5 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, 'Cannot reach appstore'));
+                if (result.statusCode !== 202) return callback(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+
+                return callback(null);
+            });
+    });
+}
@@ -16,7 +16,7 @@ var assert = require('assert'),

 var CA_PROD = 'https://acme-v01.api.letsencrypt.org',
    CA_STAGING = 'https://acme-staging.api.letsencrypt.org',
-    LE_AGREEMENT = 'https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf';
+    LE_AGREEMENT = 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf';

 exports = module.exports = {
    getCertificate: getCertificate,
@@ -10,12 +10,12 @@ exports = module.exports = {
 var assert = require('assert'),
    debug = require('debug')('box:cert/caas.js');

-function getCertificate(domain, options, callback) {
-    assert.strictEqual(typeof domain, 'string');
+function getCertificate(vhost, options, callback) {
+    assert.strictEqual(typeof vhost, 'string');
    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

-    debug('getCertificate: using fallback certificate', domain);
+    debug('getCertificate: using fallback certificate', vhost);

-    return callback(null, 'cert/host.cert', 'cert/host.key');
+    return callback(null, '', '');
 }
@@ -10,12 +10,12 @@ exports = module.exports = {
 var assert = require('assert'),
    debug = require('debug')('box:cert/fallback.js');

-function getCertificate(domain, options, callback) {
-    assert.strictEqual(typeof domain, 'string');
+function getCertificate(vhost, options, callback) {
+    assert.strictEqual(typeof vhost, 'string');
    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

-    debug('getCertificate: using fallback certificate', domain);
+    debug('getCertificate: using fallback certificate', vhost);

-    return callback(null, 'cert/host.cert', 'cert/host.key');
+    return callback(null, '', '');
 }
@@ -1,433 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    CertificatesError: CertificatesError,
-
-    ensureFallbackCertificate: ensureFallbackCertificate,
-    setFallbackCertificate: setFallbackCertificate,
-
-    validateCertificate: validateCertificate,
-    ensureCertificate: ensureCertificate,
-
-    setAdminCertificate: setAdminCertificate,
-    getAdminCertificate: getAdminCertificate,
-
-    renewAll: renewAll,
-
-    initialize: initialize,
-    uninitialize: uninitialize,
-
-    events: null,
-
-    EVENT_CERT_CHANGED: 'cert_changed',
-
-    // exported for testing
-    _getApi: getApi
-};
-
-var acme = require('./cert/acme.js'),
-    apps = require('./apps.js'),
-    assert = require('assert'),
-    async = require('async'),
-    caas = require('./cert/caas.js'),
-    config = require('./config.js'),
-    constants = require('./constants.js'),
-    debug = require('debug')('box:certificates'),
-    eventlog = require('./eventlog.js'),
-    fallback = require('./cert/fallback.js'),
-    fs = require('fs'),
-    mailer = require('./mailer.js'),
-    nginx = require('./nginx.js'),
-    path = require('path'),
-    paths = require('./paths.js'),
-    safe = require('safetydance'),
-    settings = require('./settings.js'),
-    user = require('./user.js'),
-    util = require('util');
-
-function CertificatesError(reason, errorOrMessage) {
-    assert.strictEqual(typeof reason, 'string');
-    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
-
-    Error.call(this);
-    Error.captureStackTrace(this, this.constructor);
-
-    this.name = this.constructor.name;
-    this.reason = reason;
-    if (typeof errorOrMessage === 'undefined') {
-        this.message = reason;
-    } else if (typeof errorOrMessage === 'string') {
-        this.message = errorOrMessage;
-    } else {
-        this.message = 'Internal error';
-        this.nestedError = errorOrMessage;
-    }
-}
-util.inherits(CertificatesError, Error);
-CertificatesError.INTERNAL_ERROR = 'Internal Error';
-CertificatesError.INVALID_CERT = 'Invalid certificate';
-CertificatesError.NOT_FOUND = 'Not Found';
-
-function initialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    exports.events = new (require('events').EventEmitter)();
-    callback();
-}
-
-function uninitialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    exports.events = null;
-    callback();
-}
-
-function getApi(app, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getTlsConfig(function (error, tlsConfig) {
-        if (error) return callback(error);
-
-        if (tlsConfig.provider === 'fallback') return callback(null, fallback, {});
-
-        // use acme if we have altDomain or the tlsConfig is not caas
-        var api = (app.altDomain || tlsConfig.provider) !== 'caas' ? acme : caas;
-
-        var options = { };
-        if (tlsConfig.provider === 'caas') {
-            options.prod = true; // with altDomain, we will choose acme setting based on this
-        } else { // acme
-            options.prod = tlsConfig.provider.match(/.*-prod/) !== null;
-        }
-
-        // registering user with an email requires A or MX record (https://github.com/letsencrypt/boulder/issues/1197)
-        // we cannot use admin@fqdn because the user might not have set it up.
-        // we simply update the account with the latest email we have each time when getting letsencrypt certs
-        // https://github.com/ietf-wg-acme/acme/issues/30
-        user.getOwner(function (error, owner) {
-            options.email = error ? 'support@cloudron.io' : (owner.alternateEmail || owner.email); // can error if not activated yet
-
-            callback(null, api, options);
-        });
-    });
-}
-
-function ensureFallbackCertificate(callback) {
-    // ensure a fallback certificate that much of our code requires
-    var certFilePath = path.join(paths.APP_CERTS_DIR, 'host.cert');
-    var keyFilePath = path.join(paths.APP_CERTS_DIR, 'host.key');
-
-    var fallbackCertPath = path.join(paths.NGINX_CERT_DIR, 'host.cert');
-    var fallbackKeyPath = path.join(paths.NGINX_CERT_DIR, 'host.key');
-
-    if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) { // existing custom fallback certs (when restarting, restoring, updating)
-        debug('ensureFallbackCertificate: using fallback certs provided by user');
-        if (!safe.child_process.execSync('cp ' + certFilePath + ' ' + fallbackCertPath)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-        if (!safe.child_process.execSync('cp ' + keyFilePath + ' ' + fallbackKeyPath)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-        return callback();
-    }
-
-    if (config.tlsCert() && config.tlsKey()) {
-        // cert from CaaS or cloudron-setup. these files should _not_ be part of the backup
-        debug('ensureFallbackCertificate: using CaaS/cloudron-setup fallback certs');
-        if (!safe.fs.writeFileSync(fallbackCertPath, config.tlsCert())) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-        if (!safe.fs.writeFileSync(fallbackKeyPath, config.tlsKey())) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-        return callback();
-    }
-
-    // generate a self-signed cert. it's in backup dir so that we don't create a new cert across restarts
-    // FIXME: this cert does not cover the naked domain. needs SAN
-    if (config.fqdn()) {
-        debug('ensureFallbackCertificate: generating self-signed certificate');
-        var certCommand = util.format('openssl req -x509 -newkey rsa:2048 -keyout %s -out %s -days 3650 -subj /CN=*.%s -nodes', keyFilePath, certFilePath, config.fqdn());
-        safe.child_process.execSync(certCommand);
-
-        if (!safe.child_process.execSync('cp ' + certFilePath + ' ' + fallbackCertPath)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-        if (!safe.child_process.execSync('cp ' + keyFilePath + ' ' + fallbackKeyPath)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-        return callback();
-    } else {
-        debug('ensureFallbackCertificate: cannot generate fallback certificate without domain');
-        return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, 'No domain set'));
-    }
-}
-
-function isExpiringSync(certFilePath, hours) {
-    assert.strictEqual(typeof certFilePath, 'string');
-    assert.strictEqual(typeof hours, 'number');
-
-    if (!fs.existsSync(certFilePath)) return 2; // not found
-
-    var result = safe.child_process.spawnSync('/usr/bin/openssl', [ 'x509', '-checkend', String(60 * 60 * hours), '-in', certFilePath ]);
-
-    debug('isExpiringSync: %s %s %s', certFilePath, result.stdout.toString('utf8').trim(), result.status);
-
-    return result.status === 1; // 1 - expired 0 - not expired
-}
-
-function renewAll(auditSource, callback) {
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('renewAll: Checking certificates for renewal');
-
-    apps.getAll(function (error, allApps) {
-        if (error) return callback(error);
-
-        allApps.push({ location: config.adminLocation() }); // inject fake webadmin app
-
-        var expiringApps = [ ];
-        for (var i = 0; i < allApps.length; i++) {
-            var appDomain = allApps[i].altDomain || config.appFqdn(allApps[i].location);
-
-            var certFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.user.cert');
-            var keyFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.user.key');
-
-            if (safe.fs.existsSync(certFilePath) && safe.fs.existsSync(keyFilePath)) {
-                debug('renewAll: existing user key file for %s. skipping', appDomain);
-                continue;
-            }
-
-            // check if we have an auto cert to be renewed
-            certFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.cert');
-            keyFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.key');
-
-            if (!safe.fs.existsSync(keyFilePath)) {
-                debug('renewAll: no existing key file for %s. skipping', appDomain);
-                continue;
-            }
-
-            if (isExpiringSync(certFilePath, 24 * 30)) { // expired or not found
-                expiringApps.push(allApps[i]);
-            }
-        }
-
-        debug('renewAll: %j needs to be renewed', expiringApps.map(function (a) { return a.altDomain || config.appFqdn(a.location); }));
-
-        async.eachSeries(expiringApps, function iterator(app, iteratorCallback) {
-            var domain = app.altDomain || config.appFqdn(app.location);
-
-            getApi(app, function (error, api, apiOptions) {
-                if (error) return callback(error);
-
-                debug('renewAll: renewing cert for %s with options %j', domain, apiOptions);
-
-                api.getCertificate(domain, apiOptions, function (error) {
-                    var certFilePath = path.join(paths.APP_CERTS_DIR, domain + '.cert');
-                    var keyFilePath = path.join(paths.APP_CERTS_DIR, domain + '.key');
-
-                    var errorMessage = error ? error.message : '';
-                    eventlog.add(eventlog.ACTION_CERTIFICATE_RENEWAL, auditSource, { domain: domain, errorMessage: errorMessage });
-
-                    if (error) {
-                        debug('renewAll: could not renew cert for %s because %s', domain, error);
-
-                        mailer.certificateRenewalError(domain, errorMessage);
-
-                        // check if we should fallback if we expire in the coming day
-                        if (!isExpiringSync(certFilePath, 24 * 1)) return iteratorCallback();
-
-                        debug('renewAll: using fallback certs for %s since it expires soon', domain, error);
-
-                        certFilePath = 'cert/host.cert';
-                        keyFilePath = 'cert/host.key';
-                    } else {
-                        debug('renewAll: certificate for %s renewed', domain);
-                    }
-
-                    // reconfigure and reload nginx. this is required for the case where we got a renewed cert after fallback
-                    var configureFunc = app.location === config.adminLocation() ?
-                        nginx.configureAdmin.bind(null, certFilePath, keyFilePath, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn())
-                        : nginx.configureApp.bind(null, app, certFilePath, keyFilePath);
-
-                    configureFunc(function (ignoredError) {
-                        if (ignoredError) debug('fallbackExpiredCertificates: error reconfiguring app', ignoredError);
-
-                        exports.events.emit(exports.EVENT_CERT_CHANGED, domain);
-
-                        iteratorCallback(); // move to next app
-                    });
-                });
-            });
-        });
-    });
-}
-
-// note: https://tools.ietf.org/html/rfc4346#section-7.4.2 (certificate_list) requires that the
-// servers certificate appears first (and not the intermediate cert)
-function validateCertificate(cert, key, fqdn) {
-    assert(cert === null || typeof cert === 'string');
-    assert(key === null || typeof key === 'string');
-    assert.strictEqual(typeof fqdn, 'string');
-
-    function matchesDomain(domain) {
-        if (typeof domain !== 'string') return false;
-        if (domain === fqdn) return true;
-        if (domain.indexOf('*') === 0 && domain.slice(2) === fqdn.slice(fqdn.indexOf('.') + 1)) return true;
-
-        return false;
-    }
-
-    if (cert === null && key === null) return null;
-    if (!cert && key) return new Error('missing cert');
-    if (cert && !key) return new Error('missing key');
-
-    var result = safe.child_process.execSync('openssl x509 -noout -checkhost "' + fqdn + '"', { encoding: 'utf8', input: cert });
-    if (!result) return new Error(util.format('could not get cert subject'));
-
-    // if no match, check alt names
-    if (result.indexOf('does match certificate') === -1) {
-        // https://github.com/drwetter/testssl.sh/pull/383
-        var cmd = `openssl x509 -noout -text | grep -A3 "Subject Alternative Name" | \
-                   grep "DNS:" | \
-                   sed -e "s/DNS://g" -e "s/ //g" -e "s/,/ /g" -e "s/othername:<unsupported>//g"`;
-        result = safe.child_process.execSync(cmd, { encoding: 'utf8', input: cert });
-        var altNames = result ? [ ] : result.trim().split(' '); // might fail if cert has no SAN
-        debug('validateCertificate: detected altNames as %j', altNames);
-
-        // check altNames
-        if (!altNames.some(matchesDomain)) return new Error(util.format('cert is not valid for this domain. Expecting %s in %j', fqdn, altNames));
-    }
-
-    // http://httpd.apache.org/docs/2.0/ssl/ssl_faq.html#verify
-    var certModulus = safe.child_process.execSync('openssl x509 -noout -modulus', { encoding: 'utf8', input: cert });
-    var keyModulus = safe.child_process.execSync('openssl rsa -noout -modulus', { encoding: 'utf8', input: key });
-    if (certModulus !== keyModulus) return new Error('key does not match the cert');
-
-   // check expiration
-    result = safe.child_process.execSync('openssl x509 -checkend 0', { encoding: 'utf8', input: cert });
-    if (!result) return new Error('cert expired');
-
-    return null;
-}
-
-function setFallbackCertificate(cert, key, callback) {
-    assert.strictEqual(typeof cert, 'string');
-    assert.strictEqual(typeof key, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var error = validateCertificate(cert, key, '*.' + config.fqdn());
-    if (error) return callback(new CertificatesError(CertificatesError.INVALID_CERT, error.message));
-
-    // backup the cert
-    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, 'host.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, 'host.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-    // copy over fallback cert
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, 'host.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, 'host.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-    exports.events.emit(exports.EVENT_CERT_CHANGED, '*.' + config.fqdn());
-
-    nginx.reload(function (error) {
-        if (error) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, error));
-
-        return callback(null);
-    });
-}
-
-function getFallbackCertificatePath(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    // any user fallback cert is always copied over to nginx cert dir
-    callback(null, path.join(paths.NGINX_CERT_DIR, 'host.cert'), path.join(paths.NGINX_CERT_DIR, 'host.key'));
-}
-
-function setAdminCertificate(cert, key, callback) {
-    assert.strictEqual(typeof cert, 'string');
-    assert.strictEqual(typeof key, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var vhost = config.adminFqdn();
-    var certFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.user.cert');
-    var keyFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.user.key');
-
-    var error = validateCertificate(cert, key, vhost);
-    if (error) return callback(new CertificatesError(CertificatesError.INVALID_CERT, error.message));
-
-    // backup the cert
-    if (!safe.fs.writeFileSync(certFilePath, cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-    if (!safe.fs.writeFileSync(keyFilePath, key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-    exports.events.emit(exports.EVENT_CERT_CHANGED, vhost);
-
-    nginx.configureAdmin(certFilePath, keyFilePath, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn(), callback);
-}
-
-function getAdminCertificatePath(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    var vhost = config.adminFqdn();
-    var certFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.user.cert');
-    var keyFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.user.key');
-
-    if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) return callback(null, certFilePath, keyFilePath);
-
-    certFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.cert');
-    keyFilePath = path.join(paths.APP_CERTS_DIR, vhost + '.key');
-
-    if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) return callback(null, certFilePath, keyFilePath);
-
-    getFallbackCertificatePath(callback);
-}
-
-function getAdminCertificate(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    getAdminCertificatePath(function (error, certFilePath, keyFilePath) {
-        if (error) return callback(error);
-
-        var cert = safe.fs.readFileSync(certFilePath);
-        if (!cert) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error));
-
-        var key = safe.fs.readFileSync(keyFilePath);
-        if (!cert) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error));
-
-        return callback(null, cert, key);
-    });
-}
-
-function ensureCertificate(app, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    var domain = app.altDomain || config.appFqdn(app.location);
-
-    var certFilePath = path.join(paths.APP_CERTS_DIR, domain + '.user.cert');
-    var keyFilePath = path.join(paths.APP_CERTS_DIR, domain + '.user.key');
-
-    if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) {
-        debug('ensureCertificate: %s. user certificate already exists at %s', domain, keyFilePath);
-        return callback(null, certFilePath, keyFilePath);
-    }
-
-    certFilePath = path.join(paths.APP_CERTS_DIR, domain + '.cert');
-    keyFilePath = path.join(paths.APP_CERTS_DIR, domain + '.key');
-
-    if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) {
-        debug('ensureCertificate: %s. certificate already exists at %s', domain, keyFilePath);
-
-        if (!isExpiringSync(certFilePath, 24 * 1)) return callback(null, certFilePath, keyFilePath);
-        debug('ensureCertificate: %s cert require renewal', domain);
-    } else {
-        debug('ensureCertificate: %s cert does not exist', domain);
-    }
-
-    getApi(app, function (error, api, apiOptions) {
-        if (error) return callback(error);
-
-        debug('ensureCertificate: getting certificate for %s with options %j', domain, apiOptions);
-
-        api.getCertificate(domain, apiOptions, function (error, certFilePath, keyFilePath) {
-            if (error) {
-                debug('ensureCertificate: could not get certificate. using fallback certs', error);
-                return callback(null, 'cert/host.cert', 'cert/host.key'); // use fallback certs
-            }
-
-            callback(null, certFilePath, keyFilePath);
-        });
-    });
-}
@@ -18,7 +18,7 @@ exports = module.exports = {

    // keep this in sync with start.sh ADMIN_SCOPES that generates the cid-webadmin
    SCOPE_APPS: 'apps',
-    SCOPE_DEVELOPER: 'developer',
+    SCOPE_DEVELOPER: 'developer', // obsolete
    SCOPE_PROFILE: 'profile',
    SCOPE_CLOUDRON: 'cloudron',
    SCOPE_SETTINGS: 'settings',
@@ -35,11 +35,10 @@ exports = module.exports = {
    TYPE_PROXY: 'addon-proxy'
 };

-var appdb = require('./appdb.js'),
+var apps = require('./apps.js'),
    assert = require('assert'),
    async = require('async'),
    clientdb = require('./clientdb.js'),
-    config = require('./config.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:clients'),
    hat = require('hat'),
@@ -80,7 +79,7 @@ function validateName(name) {
    if (name.length < 1) return new ClientsError(ClientsError.BAD_FIELD, 'Name must be atleast 1 character');
    if (name.length > 128) return new ClientsError(ClientsError.BAD_FIELD, 'Name too long');

-    if (/[^a-zA-Z0-9\-]/.test(name)) return new ClientsError(ClientsError.BAD_FIELD, 'Username can only contain alphanumerals and dash');
+    if (/[^a-zA-Z0-9-]/.test(name)) return new ClientsError(ClientsError.BAD_FIELD, 'Username can only contain alphanumerals and dash');

    return null;
 }
@@ -183,7 +182,7 @@ function getAll(callback) {
                return callback(null);
            }

-            appdb.get(record.appId, function (error, result) {
+            apps.get(record.appId, function (error, result) {
                if (error) {
                    console.error('Failed to get app details for oauth client', record.appId, error);
                    return callback(null);  // ignore error so we continue listing clients
@@ -192,7 +191,7 @@ function getAll(callback) {
                if (record.type === exports.TYPE_PROXY) record.name = result.manifest.title + ' Website Proxy';
                if (record.type === exports.TYPE_OAUTH) record.name = result.manifest.title + ' OAuth';

-                record.location = result.location;
+                record.domain = result.altDomain || result.intrinsicFqdn;

                tmp.push(record);

@@ -318,19 +317,20 @@ function delToken(clientId, tokenId, callback) {
    });
 }

-function addDefaultClients(callback) {
+function addDefaultClients(origin, callback) {
+    assert.strictEqual(typeof origin, 'string');
    assert.strictEqual(typeof callback, 'function');

    debug('Adding default clients');

    // The domain might have changed, therefor we have to update the record
    // !!! This needs to be in sync with the webadmin, specifically login_callback.js
-    const ADMIN_SCOPES="cloudron,developer,profile,users,apps,settings";
+    const ADMIN_SCOPES = 'cloudron,developer,profile,users,apps,settings';

    // id, appId, type, clientSecret, redirectURI, scope
    async.series([
-        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', config.adminOrigin(), ADMIN_SCOPES),
-        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', config.adminOrigin(), '*,roleSdk'),
-        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', config.adminOrigin(), '*, roleSdk')
+        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', origin, ADMIN_SCOPES),
+        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', origin, '*,roleSdk'),
+        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', origin, '*, roleSdk')
    ], callback);
 }
@@ -5,89 +5,50 @@ exports = module.exports = {

    initialize: initialize,
    uninitialize: uninitialize,
-    activate: activate,
    getConfig: getConfig,
-    getStatus: getStatus,
    getDisks: getDisks,
-    dnsSetup: dnsSetup,
    getLogs: getLogs,

-    sendCaasHeartbeat: sendCaasHeartbeat,
-
    updateToLatest: updateToLatest,
    reboot: reboot,
-    retire: retire,
-    migrate: migrate,

-    checkDiskSpace: checkDiskSpace,
+    onActivated: onActivated,

-    readDkimPublicKeySync: readDkimPublicKeySync,
-    refreshDNS: refreshDNS,
-    configureWebadmin: configureWebadmin
+    checkDiskSpace: checkDiskSpace
 };

-var appdb = require('./appdb.js'),
-    apps = require('./apps.js'),
-    assert = require('assert'),
+var assert = require('assert'),
    async = require('async'),
    backups = require('./backups.js'),
-    certificates = require('./certificates.js'),
-    child_process = require('child_process'),
-    clients = require('./clients.js'),
+    caas = require('./caas.js'),
    config = require('./config.js'),
-    constants = require('./constants.js'),
    cron = require('./cron.js'),
    debug = require('debug')('box:cloudron'),
    df = require('@sindresorhus/df'),
    eventlog = require('./eventlog.js'),
-    fs = require('fs'),
    locker = require('./locker.js'),
    mailer = require('./mailer.js'),
-    nginx = require('./nginx.js'),
    os = require('os'),
    path = require('path'),
    paths = require('./paths.js'),
    platform = require('./platform.js'),
    progress = require('./progress.js'),
+    reverseProxy = require('./reverseproxy.js'),
    safe = require('safetydance'),
    settings = require('./settings.js'),
-    SettingsError = settings.SettingsError,
    shell = require('./shell.js'),
    spawn = require('child_process').spawn,
    split = require('split'),
-    subdomains = require('./subdomains.js'),
-    superagent = require('superagent'),
-    sysinfo = require('./sysinfo.js'),
-    tld = require('tldjs'),
-    tokendb = require('./tokendb.js'),
    updateChecker = require('./updatechecker.js'),
    user = require('./user.js'),
-    UserError = user.UserError,
    util = require('util'),
    _ = require('underscore');

 var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh'),
-    UPDATE_CMD = path.join(__dirname, 'scripts/update.sh'),
-    RETIRE_CMD = path.join(__dirname, 'scripts/retire.sh');
+    UPDATE_CMD = path.join(__dirname, 'scripts/update.sh');

 var NOOP_CALLBACK = function (error) { if (error) debug(error); };

-// result to not depend on the appstore
-const BOX_AND_USER_TEMPLATE = {
-    box: {
-        region: null,
-        size: null,
-        plan: 'Custom Plan'
-    },
-    user: {
-        billing: false,
-        currency: ''
-    }
-};
-
-var gBoxAndUserDetails = null,         // cached cloudron details like region,size...
-    gWebadminStatus = { dns: false, tls: false, configuring: false };
-
 function CloudronError(reason, errorOrMessage) {
    assert.strictEqual(typeof reason, 'string');
    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
@@ -110,8 +71,6 @@ util.inherits(CloudronError, Error);
 CloudronError.BAD_FIELD = 'Field error';
 CloudronError.INTERNAL_ERROR = 'Internal Error';
 CloudronError.EXTERNAL_ERROR = 'External Error';
-CloudronError.ALREADY_PROVISIONED = 'Already Provisioned';
-CloudronError.ALREADY_SETUP = 'Already Setup';
 CloudronError.BAD_STATE = 'Bad state';
 CloudronError.ALREADY_UPTODATE = 'No Update Available';
 CloudronError.NOT_FOUND = 'Not found';
@@ -120,22 +79,12 @@ CloudronError.SELF_UPGRADE_NOT_SUPPORTED = 'Self upgrade not supported';
 function initialize(callback) {
    assert.strictEqual(typeof callback, 'function');

-    gWebadminStatus = { dns: false, tls: false, configuring: false };
-    gBoxAndUserDetails = null;
-
    async.series([
-        certificates.initialize,
        settings.initialize,
-        installAppBundle,
-        configureDefaultServer,
-        onDomainConfigured
-    ], function (error) {
-        if (error) return callback(error);
-
-        configureWebadmin(NOOP_CALLBACK); // for restore() and caas initial setup. do not block
-
-        callback();
-    });
+        reverseProxy.configureDefaultServer,
+        cron.initialize, // required for caas heartbeat before activation
+        onActivated
+    ], callback);
 }

 function uninitialize(callback) {
@@ -143,211 +92,22 @@ function uninitialize(callback) {

    async.series([
        cron.uninitialize,
-        mailer.stop,
        platform.stop,
-        certificates.uninitialize,
        settings.uninitialize
    ], callback);
 }

-function onDomainConfigured(callback) {
+function onActivated(callback) {
    callback = callback || NOOP_CALLBACK;

-    if (!config.fqdn()) return callback();
-
-    async.series([
-        clients.addDefaultClients,
-        certificates.ensureFallbackCertificate,
-        ensureDkimKey,
-        platform.start, // requires fallback certs for mail container
-        mailer.start, // this requires the "mail" container to be running
-        cron.initialize
-    ], callback);
-}
-
-function dnsSetup(dnsConfig, domain, zoneName, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (config.fqdn()) return callback(new CloudronError(CloudronError.ALREADY_SETUP));
-
-    if (!zoneName) zoneName = tld.getDomain(domain) || '';
-
-    debug('dnsSetup: Setting up Cloudron with domain %s and zone %s', domain, zoneName);
-
-    settings.setDnsConfig(dnsConfig, domain, zoneName, function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        config.setFqdn(domain); // set fqdn only after dns config is valid, otherwise cannot re-setup if we failed
-        config.setZoneName(zoneName);
-
-        async.series([ // do not block
-            onDomainConfigured,
-            configureWebadmin
-        ], NOOP_CALLBACK);
-
-        callback();
-    });
-}
-
-function configureDefaultServer(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    debug('configureDefaultServer: domain %s', config.fqdn());
-
-    if (process.env.BOX_ENV === 'test') return callback();
-
-    var certFilePath = path.join(paths.NGINX_CERT_DIR,  'default.cert');
-    var keyFilePath = path.join(paths.NGINX_CERT_DIR, 'default.key');
-
-    if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
-        debug('configureDefaultServer: create new cert');
-
-        var cn = 'cloudron-' + (new Date()).toISOString(); // randomize date a bit to keep firefox happy
-        var certCommand = util.format('openssl req -x509 -newkey rsa:2048 -keyout %s -out %s -days 3650 -subj /CN=%s -nodes', keyFilePath, certFilePath, cn);
-        safe.child_process.execSync(certCommand);
-    }
-
-    nginx.configureAdmin(certFilePath, keyFilePath, 'default.conf', '', function (error) {
-        if (error) return callback(error);
-
-        debug('configureDefaultServer: done');
-
-        callback(null);
-    });
-}
-
-function configureWebadmin(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    debug('configureWebadmin: fqdn:%s status:%j', config.fqdn(), gWebadminStatus);
-
-    if (process.env.BOX_ENV === 'test' || !config.fqdn() || gWebadminStatus.configuring) return callback();
-
-    gWebadminStatus.configuring = true; // re-entracy guard
-
-    function done(error) {
-        gWebadminStatus.configuring = false;
-        debug('configureWebadmin: done error:%j', error);
-        callback(error);
-    }
-
-    function configureNginx(error) {
-        debug('configureNginx: dns update:%j', error);
-
-        certificates.ensureCertificate({ location: config.adminLocation() }, function (error, certFilePath, keyFilePath) {
-            if (error) return done(error);
-
-            gWebadminStatus.tls = true;
-
-            nginx.configureAdmin(certFilePath, keyFilePath, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn(), done);
-        });
-    }
-
-    // update the DNS. configure nginx regardless of whether it succeeded so that
-    // box is accessible even if dns creds are invalid
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return configureNginx(error);
-
-        addDnsRecords(ip, function (error) {
-            if (error) return configureNginx(error);
-
-            subdomains.waitForDns(config.adminFqdn(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
-                if (error) return configureNginx(error);
-
-                gWebadminStatus.dns = true;
-
-                configureNginx();
-            });
-        });
-    });
-}
-
-function setTimeZone(ip, callback) {
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('setTimeZone ip:%s', ip);
-
-    superagent.get('https://geolocation.cloudron.io/json').query({ ip: ip }).timeout(10 * 1000).end(function (error, result) {
-        if ((error && !error.response) || result.statusCode !== 200) {
-            debug('Failed to get geo location: %s', error.message);
-            return callback(null);
-        }
-
-        var timezone = safe.query(result.body, 'location.time_zone');
-
-        if (!timezone || typeof timezone !== 'string') {
-            debug('No timezone in geoip response : %j', result.body);
-            return callback(null);
-        }
-
-        debug('Setting timezone to ', timezone);
-
-        settings.setTimeZone(timezone, callback);
-    });
-}
-
-function activate(username, password, email, displayName, ip, auditSource, callback) {
-    assert.strictEqual(typeof username, 'string');
-    assert.strictEqual(typeof password, 'string');
-    assert.strictEqual(typeof email, 'string');
-    assert.strictEqual(typeof displayName, 'string');
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('activating user:%s email:%s', username, email);
-
-    setTimeZone(ip, function () { }); // TODO: get this from user. note that timezone is detected based on the browser location and not the cloudron region
-
-    user.createOwner(username, password, email, displayName, auditSource, function (error, userObject) {
-        if (error && error.reason === UserError.ALREADY_EXISTS) return callback(new CloudronError(CloudronError.ALREADY_PROVISIONED));
-        if (error && error.reason === UserError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        clients.get('cid-webadmin', function (error, result) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-            // Also generate a token so the admin creation can also act as a login
-            var token = tokendb.generateToken();
-            var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
-
-            tokendb.add(token, userObject.id, result.id, expires, '*', function (error) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-                eventlog.add(eventlog.ACTION_ACTIVATE, auditSource, { });
-
-                platform.createMailConfig(NOOP_CALLBACK); // bounces can now be sent to the cloudron owner
-
-                callback(null, { token: token, expires: expires });
-            });
-        });
-    });
-}
-
-function getStatus(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
+    // Starting the platform after a user is available means:
+    // 1. mail bounces can now be sent to the cloudron owner
+    // 2. the restore code path can run without sudo (since mail/ is non-root)
    user.count(function (error, count) {
        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+        if (!count) return callback(); // not activated

-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-            callback(null, {
-                activated: count !== 0,
-                version: config.version(),
-                apiServerOrigin: config.apiServerOrigin(), // used by CaaS tool
-                provider: config.provider(),
-                cloudronName: cloudronName,
-                adminFqdn: config.fqdn() ? config.adminFqdn() : null,
-                webadminStatus: gWebadminStatus
-            });
-        });
+        platform.start(callback);
    });
 }

@@ -377,32 +137,23 @@ function getDisks(callback) {
    });
 }

-function getBoxAndUserDetails(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    if (gBoxAndUserDetails) return callback(null, gBoxAndUserDetails);
-
-    // only supported for caas
-    if (config.provider() !== 'caas') return callback(null, {});
-
-    superagent
-        .get(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn())
-        .query({ token: config.token() })
-        .timeout(30 * 1000)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new CloudronError(CloudronError.EXTERNAL_ERROR, 'Cannot reach appstore'));
-            if (result.statusCode !== 200) return callback(new CloudronError(CloudronError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
-
-            gBoxAndUserDetails = result.body;
-
-            return callback(null, gBoxAndUserDetails);
-        });
-}
-
 function getConfig(callback) {
    assert.strictEqual(typeof callback, 'function');

-    getBoxAndUserDetails(function (error, result) {
+    // result to not depend on the appstore
+    const BOX_AND_USER_TEMPLATE = {
+        box: {
+            region: null,
+            size: null,
+            plan: 'Custom Plan'
+        },
+        user: {
+            billing: false,
+            currency: ''
+        }
+    };
+
+    caas.getBoxAndUserDetails(function (error, result) {
        if (error) debug('Failed to fetch cloudron details.', error.reason, error.message);

        result = _.extend(BOX_AND_USER_TEMPLATE, result || {});
@@ -410,181 +161,30 @@ function getConfig(callback) {
        settings.getCloudronName(function (error, cloudronName) {
            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));

-            settings.getDeveloperMode(function (error, developerMode) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-                callback(null, {
-                    apiServerOrigin: config.apiServerOrigin(),
-                    webServerOrigin: config.webServerOrigin(),
-                    fqdn: config.fqdn(),
-                    adminLocation: config.adminLocation(),
-                    adminFqdn: config.adminFqdn(),
-                    mailFqdn: config.mailFqdn(),
-                    version: config.version(),
-                    update: updateChecker.getUpdateInfo(),
-                    progress: progress.getAll(),
-                    isCustomDomain: config.isCustomDomain(),
-                    isDemo: config.isDemo(),
-                    developerMode: developerMode,
-                    region: result.box.region,
-                    size: result.box.size,
-                    billing: !!result.user.billing,
-                    plan: result.box.plan,
-                    currency: result.user.currency,
-                    memory: os.totalmem(),
-                    provider: config.provider(),
-                    cloudronName: cloudronName
-                });
+            callback(null, {
+                apiServerOrigin: config.apiServerOrigin(),
+                webServerOrigin: config.webServerOrigin(),
+                adminDomain: config.adminDomain(),
+                adminLocation: config.adminLocation(),
+                adminFqdn: config.adminFqdn(),
+                mailFqdn: config.mailFqdn(),
+                version: config.version(),
+                update: updateChecker.getUpdateInfo(),
+                progress: progress.getAll(),
+                isDemo: config.isDemo(),
+                region: result.box.region,
+                size: result.box.size,
+                billing: !!result.user.billing,
+                plan: result.box.plan,
+                currency: result.user.currency,
+                memory: os.totalmem(),
+                provider: config.provider(),
+                cloudronName: cloudronName
            });
        });
    });
 }

-function sendCaasHeartbeat() {
-    assert(config.provider() === 'caas', 'Heartbeat is only sent for managed cloudrons');
-
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/heartbeat';
-    superagent.post(url).query({ token: config.token(), version: config.version() }).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) debug('Network error sending heartbeat.', error);
-        else if (result.statusCode !== 200) debug('Server responded to heartbeat with %s %s', result.statusCode, result.text);
-        else debug('Heartbeat sent to %s', url);
-    });
-}
-
-function ensureDkimKey(callback) {
-    assert(config.fqdn(), 'fqdn is not set');
-
-    var dkimPath = path.join(paths.MAIL_DATA_DIR, 'dkim/' + config.fqdn());
-    var dkimPrivateKeyFile = path.join(dkimPath, 'private');
-    var dkimPublicKeyFile = path.join(dkimPath, 'public');
-
-    if (!fs.existsSync(dkimPrivateKeyFile) || !fs.existsSync(dkimPublicKeyFile)) {
-        debug('Generating new DKIM keys');
-
-        if (!safe.fs.mkdirSync(dkimPath) && safe.error.code !== 'EEXIST') {
-            debug('Error creating dkim.', safe.error);
-            return null;
-        }
-
-        child_process.execSync('openssl genrsa -out ' + dkimPrivateKeyFile + ' 1024');
-        child_process.execSync('openssl rsa -in ' + dkimPrivateKeyFile + ' -out ' + dkimPublicKeyFile + ' -pubout -outform PEM');
-    } else {
-        debug('DKIM keys already present');
-    }
-
-    callback();
-}
-
-function readDkimPublicKeySync() {
-    if (!config.fqdn()) {
-        debug('Cannot read dkim public key without a domain.', safe.error);
-        return null;
-    }
-
-    var dkimPath = path.join(paths.MAIL_DATA_DIR, 'dkim/' + config.fqdn());
-    var dkimPublicKeyFile = path.join(dkimPath, 'public');
-
-    var publicKey = safe.fs.readFileSync(dkimPublicKeyFile, 'utf8');
-
-    if (publicKey === null) {
-        debug('Error reading dkim public key.', safe.error);
-        return null;
-    }
-
-    // remove header, footer and new lines
-    publicKey = publicKey.split('\n').slice(1, -2).join('');
-
-    return publicKey;
-}
-
-// NOTE: if you change the SPF record here, be sure the wait check in mailer.js
-// https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
-function txtRecordsWithSpf(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomains.get('', 'TXT', function (error, txtRecords) {
-        if (error) return callback(error);
-
-        debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
-
-        var i, matches, validSpf;
-
-        for (i = 0; i < txtRecords.length; i++) {
-            matches = txtRecords[i].match(/^("?v=spf1) /); // DO backend may return without quotes
-            if (matches === null) continue;
-
-            // this won't work if the entry is arbitrarily "split" across quoted strings
-            validSpf = txtRecords[i].indexOf('a:' + config.adminFqdn()) !== -1;
-            break; // there can only be one SPF record
-        }
-
-        if (validSpf) return callback(null, null);
-
-        if (!matches) { // no spf record was found, create one
-            txtRecords.push('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
-            debug('txtRecordsWithSpf: adding txt record');
-        } else { // just add ourself
-            txtRecords[i] = matches[1] + ' a:' + config.adminFqdn() + txtRecords[i].slice(matches[1].length);
-            debug('txtRecordsWithSpf: inserting txt record');
-        }
-
-        return callback(null, txtRecords);
-    });
-}
-
-function addDnsRecords(ip, callback) {
-    assert.strictEqual(typeof ip, 'string');
-    callback = callback || NOOP_CALLBACK;
-
-    if (process.env.BOX_ENV === 'test') return callback();
-
-    var dkimKey = readDkimPublicKeySync();
-    if (!dkimKey) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
-
-    var webadminRecord = { subdomain: config.adminLocation(), type: 'A', values: [ ip ] };
-    // t=s limits the domainkey to this domain and not it's subdomains
-    var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
-
-    var records = [ ];
-    if (config.isCustomDomain()) {
-        records.push(webadminRecord);
-        records.push(dkimRecord);
-    } else {
-        // for non-custom domains, we show a noapp.html page
-        var nakedDomainRecord = { subdomain: '', type: 'A', values: [ ip ] };
-
-        records.push(nakedDomainRecord);
-        records.push(webadminRecord);
-        records.push(dkimRecord);
-    }
-
-    debug('addDnsRecords: %j', records);
-
-    async.retry({ times: 10, interval: 20000 }, function (retryCallback) {
-        txtRecordsWithSpf(function (error, txtRecords) {
-            if (error) return retryCallback(error);
-
-            if (txtRecords) records.push({ subdomain: '', type: 'TXT', values: txtRecords });
-
-            debug('addDnsRecords: will update %j', records);
-
-            async.mapSeries(records, function (record, iteratorCallback) {
-                subdomains.upsert(record.subdomain, record.type, record.values, iteratorCallback);
-            }, function (error, changeIds) {
-                if (error) debug('addDnsRecords: failed to update : %s. will retry', error);
-                else debug('addDnsRecords: records %j added with changeIds %j', records, changeIds);
-
-                retryCallback(error);
-            });
-        });
-    }, function (error) {
-        if (error) debug('addDnsRecords: done updating records with error:', error);
-        else debug('addDnsRecords: done');
-
-        callback(error);
-    });
-}
-
 function reboot(callback) {
    shell.sudo('reboot', [ REBOOT_CMD ], callback);
 }
@@ -607,7 +207,7 @@ function update(boxUpdateInfo, auditSource, callback) {
    // initiate the update/upgrade but do not wait for it
    if (boxUpdateInfo.upgrade) {
        debug('Starting upgrade');
-        doUpgrade(boxUpdateInfo, function (error) {
+        caas.upgrade(boxUpdateInfo, function (error) {
            if (error) {
                debug('Upgrade failed with error:', error);
                locker.unlock(locker.OP_BOX_UPDATE);
@@ -626,7 +226,6 @@ function update(boxUpdateInfo, auditSource, callback) {
    callback(null);
 }

-
 function updateToLatest(auditSource, callback) {
    assert.strictEqual(typeof auditSource, 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -659,36 +258,6 @@ function doShortCircuitUpdate(boxUpdateInfo, callback) {
    callback();
 }

-function doUpgrade(boxUpdateInfo, callback) {
-    assert(boxUpdateInfo !== null && typeof boxUpdateInfo === 'object');
-
-    function upgradeError(e) {
-        progress.set(progress.UPDATE, -1, e.message);
-        callback(e);
-    }
-
-    progress.set(progress.UPDATE, 5, 'Backing up for upgrade');
-
-    backups.backupBoxAndApps({ userId: null, username: 'upgrader' }, function (error) {
-        if (error) return upgradeError(error);
-
-        superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/upgrade')
-            .query({ token: config.token() })
-            .send({ version: boxUpdateInfo.version })
-            .timeout(30 * 1000)
-            .end(function (error, result) {
-                if (error && !error.response) return upgradeError(new Error('Network error making upgrade request: ' + error));
-                if (result.statusCode !== 202) return upgradeError(new Error(util.format('Server not ready to upgrade. statusCode: %s body: %j', result.status, result.body)));
-
-                progress.set(progress.UPDATE, 10, 'Updating base system');
-
-                // no need to unlock since this is the last thing we ever do on this box
-                callback();
-                retire('upgrade');
-            });
-    });
-}
-
 function doUpdate(boxUpdateInfo, callback) {
    assert(boxUpdateInfo && typeof boxUpdateInfo === 'object');

@@ -705,23 +274,17 @@ function doUpdate(boxUpdateInfo, callback) {
        // NOTE: this data is opaque and will be passed through the installer.sh
        var data= {
            provider: config.provider(),
-            token: config.token(),
            apiServerOrigin: config.apiServerOrigin(),
            webServerOrigin: config.webServerOrigin(),
-            fqdn: config.fqdn(),
+            adminDomain: config.adminDomain(),
+            adminFqdn: config.adminFqdn(),
            adminLocation: config.adminLocation(),
-            tlsCert: config.tlsCert(),
-            tlsKey: config.tlsKey(),
-            isCustomDomain: config.isCustomDomain(),
            isDemo: config.isDemo(),
-            zoneName: config.zoneName(),

            appstore: {
-                token: config.token(),
                apiServerOrigin: config.apiServerOrigin()
            },
            caas: {
-                token: config.token(),
                apiServerOrigin: config.apiServerOrigin(),
                webServerOrigin: config.webServerOrigin()
            },
@@ -741,36 +304,6 @@ function doUpdate(boxUpdateInfo, callback) {
    });
 }

-function installAppBundle(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    if (fs.existsSync(paths.FIRST_RUN_FILE)) return callback();
-
-    var bundle = config.get('appBundle');
-    debug('initialize: installing app bundle on first run: %j', bundle);
-
-    if (!bundle || bundle.length === 0) return callback();
-
-    async.eachSeries(bundle, function (appInfo, iteratorCallback) {
-        debug('autoInstall: installing %s at %s', appInfo.appstoreId, appInfo.location);
-
-        var data = {
-            appStoreId: appInfo.appstoreId,
-            location: appInfo.location,
-            portBindings: appInfo.portBindings || null,
-            accessRestriction: appInfo.accessRestriction || null,
-        };
-
-        apps.install(data, { userId: null, username: 'autoinstaller' }, iteratorCallback);
-    }, function (error) {
-        if (error) debug('autoInstallApps: ', error);
-
-        fs.writeFileSync(paths.FIRST_RUN_FILE, 'been there, done that', 'utf8');
-
-        callback();
-    });
-}
-
 function checkDiskSpace(callback) {
    callback = callback || NOOP_CALLBACK;

@@ -813,113 +346,6 @@ function checkDiskSpace(callback) {
    });
 }

-function retire(reason, info, callback) {
-    assert(reason === 'migrate' || reason === 'upgrade');
-    info = info || { };
-    callback = callback || NOOP_CALLBACK;
-
-    var data = {
-        apiServerOrigin: config.apiServerOrigin(),
-        isCustomDomain: config.isCustomDomain(),
-        fqdn: config.fqdn()
-    };
-    shell.sudo('retire', [ RETIRE_CMD, reason, JSON.stringify(info), JSON.stringify(data) ], callback);
-}
-
-function doMigrate(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    var error = locker.lock(locker.OP_MIGRATE);
-    if (error) return callback(new CloudronError(CloudronError.BAD_STATE, error.message));
-
-    function unlock(error) {
-        debug('Failed to migrate', error);
-        locker.unlock(locker.OP_MIGRATE);
-        progress.set(progress.MIGRATE, -1, 'Backup failed: ' + error.message);
-    }
-
-    progress.set(progress.MIGRATE, 10, 'Backing up for migration');
-
-    // initiate the migration in the background
-    backups.backupBoxAndApps({ userId: null, username: 'migrator' }, function (error) {
-        if (error) return unlock(error);
-
-        debug('migrate: domain: %s size %s region %s', options.domain, options.size, options.region);
-
-        superagent
-            .post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/migrate')
-            .query({ token: config.token() })
-            .send(options)
-            .timeout(30 * 1000)
-            .end(function (error, result) {
-                if (error && !error.response) return unlock(error); // network error
-                if (result.statusCode === 409) return unlock(new CloudronError(CloudronError.BAD_STATE));
-                if (result.statusCode === 404) return unlock(new CloudronError(CloudronError.NOT_FOUND));
-                if (result.statusCode !== 202) return unlock(new CloudronError(CloudronError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
-
-                progress.set(progress.MIGRATE, 10, 'Migrating');
-
-                retire('migrate', _.pick(options, 'domain', 'size', 'region'));
-            });
-    });
-
-    callback(null);
-}
-
-function migrate(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (config.isDemo()) return callback(new CloudronError(CloudronError.BAD_FIELD, 'Not allowed in demo mode'));
-
-    if (!options.domain) return doMigrate(options, callback);
-
-    var dnsConfig = _.pick(options, 'domain', 'provider', 'accessKeyId', 'secretAccessKey', 'region', 'endpoint', 'token', 'zoneName');
-
-    settings.setDnsConfig(dnsConfig, options.domain, options.zoneName || tld.getDomain(options.domain), function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        // TODO: should probably rollback dns config if migrate fails
-        doMigrate(options, callback);
-    });
-}
-
-// called for dynamic dns setups where we have to update the IP
-function refreshDNS(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        debug('refreshDNS: current ip %s', ip);
-
-        addDnsRecords(ip, function (error) {
-            if (error) return callback(error);
-
-            debug('refreshDNS: done for system records');
-
-            apps.getAll(function (error, result) {
-                if (error) return callback(error);
-
-                async.each(result, function (app, callback) {
-                    // do not change state of installing apps since apptask will error if dns record already exists
-                    if (app.installationState !== appdb.ISTATE_INSTALLED) return callback();
-
-                    subdomains.upsert(app.location, 'A', [ ip ], callback);
-                }, function (error) {
-                    if (error) return callback(error);
-
-                    debug('refreshDNS: done for apps');
-
-                    callback();
-                });
-            });
-        });
-    });
-}
-
 function getLogs(options, callback) {
    assert(options && typeof options === 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -16,13 +16,13 @@ exports = module.exports = {
    provider: provider,
    apiServerOrigin: apiServerOrigin,
    webServerOrigin: webServerOrigin,
-    fqdn: fqdn,
-    zoneName: zoneName,
-    setFqdn: setFqdn,
-    token: token,
+    adminDomain: adminDomain,
+    setFqdn: setAdminDomain,
+    setAdminDomain: setAdminDomain,
+    setAdminFqdn: setAdminFqdn,
+    setAdminLocation: setAdminLocation,
    version: version,
    setVersion: setVersion,
-    isCustomDomain: isCustomDomain,
    database: database,

    // these values are derived
@@ -33,16 +33,11 @@ exports = module.exports = {
    adminFqdn: adminFqdn,
    mailLocation: mailLocation,
    mailFqdn: mailFqdn,
-    appFqdn: appFqdn,
-    setZoneName: setZoneName,
    hasIPv6: hasIPv6,
    dkimSelector: dkimSelector,

    isDemo: isDemo,

-    tlsCert: tlsCert,
-    tlsKey: tlsKey,
-
    // for testing resets to defaults
    _reset: _reset
 };
@@ -51,9 +46,12 @@ var assert = require('assert'),
    fs = require('fs'),
    path = require('path'),
    safe = require('safetydance'),
-    tld = require('tldjs'),
    _ = require('underscore');

+
+// assert on unknown environment can't proceed
+assert(exports.CLOUDRON || exports.TEST, 'Unknown environment. This should not happen!');
+
 var homeDir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;

 var data = { };
@@ -65,8 +63,23 @@ function baseDir() {

 var cloudronConfigFileName = path.join(baseDir(), 'configs/cloudron.conf');

+// only tests can run without a config file on disk, they use the defaults with runtime overrides
+if (exports.CLOUDRON) assert(fs.existsSync(cloudronConfigFileName), 'No cloudron.conf found, cannot proceed');
+
 function saveSync() {
-    fs.writeFileSync(cloudronConfigFileName, JSON.stringify(data, null, 4)); // functions are ignored by JSON.stringify
+    // only save values we want to have in the cloudron.conf, see start.sh
+    var conf = {
+        version: data.version,
+        apiServerOrigin: data.apiServerOrigin,
+        webServerOrigin: data.webServerOrigin,
+        adminDomain: data.adminDomain,
+        adminFqdn: data.adminFqdn,
+        adminLocation: data.adminLocation,
+        provider: data.provider,
+        isDemo: data.isDemo
+    };
+
+    fs.writeFileSync(cloudronConfigFileName, JSON.stringify(conf, null, 4)); // functions are ignored by JSON.stringify
 }

 function _reset(callback) {
@@ -79,46 +92,39 @@ function _reset(callback) {

 function initConfig() {
    // setup defaults
-    data.fqdn = 'localhost';
-    data.zoneName = '';
+    data.adminFqdn = '';
+    data.adminDomain = '';
    data.adminLocation = 'my';
-
-    data.token = null;
+    data.port = 3000;
    data.version = null;
-    data.isCustomDomain = true;
+    data.apiServerOrigin = null;
    data.webServerOrigin = null;
-    data.smtpPort = 2525; // // this value comes from mail container
+    data.provider = 'generic';
+    data.smtpPort = 2525; // this value comes from mail container
    data.sysadminPort = 3001;
    data.ldapPort = 3002;
-    data.provider = 'caas';
-    data.appBundle = [ ];

-    if (exports.CLOUDRON) {
-        data.port = 3000;
-        data.apiServerOrigin = null;
-        data.database = null;
-    } else if (exports.TEST) {
+    // keep in sync with start.sh
+    data.database = {
+        hostname: '127.0.0.1',
+        username: 'root',
+        password: 'password',
+        port: 3306,
+        name: 'box'
+    };
+
+    // overrides for local testings
+    if (exports.TEST) {
+        data.version = '1.1.1-test';
        data.port = 5454;
        data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
-        data.database = {
-            hostname: '127.0.0.1',
-            username: 'root',
-            password: '',
-            port: 3306,
-            name: 'boxtest'
-        };
-        data.token = 'APPSTORE_TOKEN';
-    } else {
-        assert(false, 'Unknown environment. This should not happen!');
+        data.database.password = '';
+        data.database.name = 'boxtest';
    }

-    if (safe.fs.existsSync(cloudronConfigFileName)) {
-        var existingData = safe.JSON.parse(safe.fs.readFileSync(cloudronConfigFileName, 'utf8'));
-        _.extend(data, existingData); // overwrite defaults with saved config
-        return;
-    }
-
-    saveSync();
+    // overwrite defaults with saved config
+    var existingData = safe.JSON.parse(safe.fs.readFileSync(cloudronConfigFileName, 'utf8'));
+    _.extend(data, existingData);
 }

 initConfig();
@@ -134,6 +140,7 @@ function set(key, value) {
    } else {
        data = safe.set(data, key, value);
    }
+
    saveSync();
 }

@@ -151,52 +158,41 @@ function webServerOrigin() {
    return get('webServerOrigin');
 }

-function setFqdn(fqdn) {
-    set('fqdn', fqdn);
+function setAdminDomain(domain) {
+    set('adminDomain', domain);
 }

-function fqdn() {
-    return get('fqdn');
-}
-
-function setZoneName(zone) {
-    set('zoneName', zone);
-}
-
-function zoneName() {
-    var zone = get('zoneName');
-    if (zone) return zone;
-
-    // TODO: move this to migration code path instead
-    return tld.getDomain(fqdn()) || '';
-}
-
-// keep this in sync with start.sh admin.conf generation code
-function appFqdn(location) {
-    assert.strictEqual(typeof location, 'string');
-
-    if (location === '') return fqdn();
-    return isCustomDomain() ? location + '.' + fqdn() : location + '-' + fqdn();
+function adminDomain() {
+    return get('adminDomain');
 }

 function mailLocation() {
    return get('adminLocation'); // not a typo! should be same as admin location until we figure out certificates
 }

-function mailFqdn() {
-    return appFqdn(mailLocation());
+function setAdminLocation(location) {
+    set('adminLocation', location);
 }

+
 function adminLocation() {
    return get('adminLocation');
 }

+function setAdminFqdn(adminFqdn) {
+    set('adminFqdn', adminFqdn);
+}
+
 function adminFqdn() {
-    return appFqdn(adminLocation());
+    return get('adminFqdn');
+}
+
+function mailFqdn() {
+    return adminFqdn();
 }

 function adminOrigin() {
-    return 'https://' + appFqdn(adminLocation());
+    return 'https://' + adminFqdn();
 }

 function internalAdminOrigin() {
@@ -207,10 +203,6 @@ function sysadminOrigin() {
    return 'http://127.0.0.1:' + get('sysadminPort');
 }

-function token() {
-    return get('token');
-}
-
 function version() {
    return get('version');
 }
@@ -219,10 +211,6 @@ function setVersion(version) {
    set('version', version);
 }

-function isCustomDomain() {
-    return get('isCustomDomain');
-}
-
 function database() {
    return get('database');
 }
@@ -235,21 +223,13 @@ function provider() {
    return get('provider');
 }

-function tlsCert() {
-    var certFile = path.join(baseDir(), 'configs/host.cert');
-    return safe.fs.readFileSync(certFile, 'utf8');
-}
-
-function tlsKey() {
-    var keyFile = path.join(baseDir(), 'configs/host.key');
-    return safe.fs.readFileSync(keyFile, 'utf8');
-}
-
 function hasIPv6() {
    const IPV6_PROC_FILE = '/proc/net/if_inet6';
    return fs.existsSync(IPV6_PROC_FILE);
 }

+// it has to change with the adminLocation so that multiple cloudrons
+// can send out emails at the same time.
 function dkimSelector() {
    var loc = adminLocation();
    return loc === 'my' ? 'cloudron' : `cloudron-${loc.replace(/\./g, '')}`;
@@ -4,13 +4,14 @@ exports = module.exports = {
    API_LOCATION: 'api', // this is unused but reserved for future use (#403)
    SMTP_LOCATION: 'smtp',
    IMAP_LOCATION: 'imap',
-    POSTMAN_LOCATION: 'postman', // used in dovecot bounces

    // These are combined into one array because users and groups become mailboxes
    RESERVED_NAMES: [
        // Reserved usernames
        // https://github.com/gogits/gogs/blob/52c8f691630548fe091d30bcfe8164545a05d3d5/models/repo.go#L393
-        'admin', 'no-reply', 'postmaster', 'mailer-daemon', // apps like wordpress, gogs don't like these
+        // apps like wordpress, gogs don't like these
+        // postmaster is used in dovecot and haraka
+        'admin', 'no-reply', 'postmaster', 'mailer-daemon',

        // Reserved groups
        'admins', 'users'         // ldap code uses 'users' pseudo group
@@ -19,8 +20,8 @@ exports = module.exports = {
    ADMIN_NAME: 'Settings',

    ADMIN_CLIENT_ID: 'webadmin', // oauth client id
-    ADMIN_APPID: 'admin', // admin appid (settingsdb)

+    ADMIN_GROUP_NAME: 'admin',
    ADMIN_GROUP_ID: 'admin',

    NGINX_ADMIN_CONFIG_FILE_NAME: 'admin.conf',
@@ -9,35 +9,39 @@ var apps = require('./apps.js'),
    appstore = require('./appstore.js'),
    assert = require('assert'),
    backups = require('./backups.js'),
-    certificates = require('./certificates.js'),
+    caas = require('./caas.js'),
    cloudron = require('./cloudron.js'),
    config = require('./config.js'),
    constants = require('./constants.js'),
    CronJob = require('cron').CronJob,
    debug = require('debug')('box:cron'),
    digest = require('./digest.js'),
+    dyndns = require('./dyndns.js'),
    eventlog = require('./eventlog.js'),
    janitor = require('./janitor.js'),
+    reverseProxy = require('./reverseproxy.js'),
    scheduler = require('./scheduler.js'),
    settings = require('./settings.js'),
    semver = require('semver'),
    updateChecker = require('./updatechecker.js');

-var gAliveJob = null, // send periodic stats
-    gAppUpdateCheckerJob = null,
-    gAutoupdaterJob = null,
-    gBackupJob = null,
-    gBoxUpdateCheckerJob = null,
-    gCertificateRenewJob = null,
-    gCheckDiskSpaceJob = null,
-    gCleanupBackupsJob = null,
-    gCleanupEventlogJob = null,
-    gCleanupTokensJob = null,
-    gDockerVolumeCleanerJob = null,
-    gDynamicDNSJob = null,
-    gCaasHeartbeatJob = null, // for CaaS health check
-    gSchedulerSyncJob = null,
-    gDigestEmailJob = null;
+var gJobs = {
+    alive: null, // send periodic stats
+    autoUpdater: null,
+    appUpdateChecker: null,
+    backup: null,
+    boxUpdateChecker: null,
+    caasHeartbeat: null,
+    checkDiskSpace: null,
+    certificateRenew: null,
+    cleanupBackups: null,
+    cleanupEventlog: null,
+    cleanupTokens: null,
+    digestEmail: null,
+    dockerVolumeCleaner: null,
+    dynamicDNS: null,
+    schedulerSync: null
+};

 var NOOP_CALLBACK = function (error) { if (error) console.error(error); };
 var AUDIT_SOURCE = { userId: null, username: 'cron' };
@@ -54,22 +58,20 @@ function initialize(callback) {
    assert.strictEqual(typeof callback, 'function');

    if (config.provider() === 'caas') {
-        gCaasHeartbeatJob = new CronJob({
-            cronTime: '00 */1 * * * *', // every minute
-            onTick: cloudron.sendCaasHeartbeat,
-            start: false
-        });
        // hack: send the first heartbeat only after we are running for 60 seconds
        // required as we end up sending a heartbeat and then cloudron-setup reboots the server
-        setTimeout(function () {
-            if (!gCaasHeartbeatJob) return; // already uninitalized
-            gCaasHeartbeatJob.start();
-            cloudron.sendCaasHeartbeat();
-        }, 1000 * 60);
+        var seconds = (new Date()).getSeconds() - 1;
+        if (seconds === -1) seconds = 59;
+
+        gJobs.caasHeartbeat = new CronJob({
+            cronTime: `${seconds} */1 * * * *`, // every minute
+            onTick: caas.sendHeartbeat,
+            start: true
+        });
    }

    var randomHourMinute = Math.floor(60*Math.random());
-    gAliveJob = new CronJob({
+    gJobs.alive = new CronJob({
        cronTime: '00 ' + randomHourMinute + ' * * * *', // every hour on a random minute
        onTick: appstore.sendAliveStatus,
        start: true
@@ -77,14 +79,14 @@ function initialize(callback) {

    settings.events.on(settings.TIME_ZONE_KEY, recreateJobs);
    settings.events.on(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
-    settings.events.on(settings.DYNAMIC_DNS_KEY, dynamicDNSChanged);
+    settings.events.on(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);

    settings.getAll(function (error, allSettings) {
        if (error) return callback(error);

        recreateJobs(allSettings[settings.TIME_ZONE_KEY]);
        autoupdatePatternChanged(allSettings[settings.AUTOUPDATE_PATTERN_KEY]);
-        dynamicDNSChanged(allSettings[settings.DYNAMIC_DNS_KEY]);
+        dynamicDnsChanged(allSettings[settings.DYNAMIC_DNS_KEY]);

        callback();
    });
@@ -95,16 +97,16 @@ function recreateJobs(tz) {

    debug('Creating jobs with timezone %s', tz);

-    if (gBackupJob) gBackupJob.stop();
-    gBackupJob = new CronJob({
+    if (gJobs.backup) gJobs.backup.stop();
+    gJobs.backup = new CronJob({
        cronTime: '00 00 */6 * * *', // every 6 hours. backups.ensureBackup() will only trigger a backup once per day
        onTick: backups.ensureBackup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
        start: true,
        timeZone: tz
    });

-    if (gCheckDiskSpaceJob) gCheckDiskSpaceJob.stop();
-    gCheckDiskSpaceJob = new CronJob({
+    if (gJobs.checkDiskSpace) gJobs.checkDiskSpace.stop();
+    gJobs.checkDiskSpace = new CronJob({
        cronTime: '00 30 */4 * * *', // every 4 hours
        onTick: cloudron.checkDiskSpace,
        start: true,
@@ -114,72 +116,72 @@ function recreateJobs(tz) {
    // randomized pattern per cloudron every hour
    var randomMinute = Math.floor(60*Math.random());

-    if (gBoxUpdateCheckerJob) gBoxUpdateCheckerJob.stop();
-    gBoxUpdateCheckerJob = new CronJob({
+    if (gJobs.boxUpdateCheckerJob) gJobs.boxUpdateCheckerJob.stop();
+    gJobs.boxUpdateCheckerJob = new CronJob({
        cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
        onTick: updateChecker.checkBoxUpdates,
        start: true,
        timeZone: tz
    });

-    if (gAppUpdateCheckerJob) gAppUpdateCheckerJob.stop();
-    gAppUpdateCheckerJob = new CronJob({
+    if (gJobs.appUpdateChecker) gJobs.appUpdateChecker.stop();
+    gJobs.appUpdateChecker = new CronJob({
        cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
        onTick: updateChecker.checkAppUpdates,
        start: true,
        timeZone: tz
    });

-    if (gCleanupTokensJob) gCleanupTokensJob.stop();
-    gCleanupTokensJob = new CronJob({
+    if (gJobs.cleanupTokens) gJobs.cleanupTokens.stop();
+    gJobs.cleanupTokens = new CronJob({
        cronTime: '00 */30 * * * *', // every 30 minutes
        onTick: janitor.cleanupTokens,
        start: true,
        timeZone: tz
    });

-    if (gCleanupBackupsJob) gCleanupBackupsJob.stop();
-    gCleanupBackupsJob = new CronJob({
+    if (gJobs.cleanupBackups) gJobs.cleanupBackups.stop();
+    gJobs.cleanupBackups = new CronJob({
        cronTime: '00 45 */6 * * *', // every 6 hours. try not to overlap with ensureBackup job
        onTick: backups.cleanup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
        start: true,
        timeZone: tz
    });

-    if (gCleanupEventlogJob) gCleanupEventlogJob.stop();
-    gCleanupEventlogJob = new CronJob({
+    if (gJobs.cleanupEventlog) gJobs.cleanupEventlog.stop();
+    gJobs.cleanupEventlog = new CronJob({
        cronTime: '00 */30 * * * *', // every 30 minutes
        onTick: eventlog.cleanup,
        start: true,
        timeZone: tz
    });

-    if (gDockerVolumeCleanerJob) gDockerVolumeCleanerJob.stop();
-    gDockerVolumeCleanerJob = new CronJob({
+    if (gJobs.dockerVolumeCleaner) gJobs.dockerVolumeCleaner.stop();
+    gJobs.dockerVolumeCleaner = new CronJob({
        cronTime: '00 00 */12 * * *', // every 12 hours
        onTick: janitor.cleanupDockerVolumes,
        start: true,
        timeZone: tz
    });

-    if (gSchedulerSyncJob) gSchedulerSyncJob.stop();
-    gSchedulerSyncJob = new CronJob({
+    if (gJobs.schedulerSync) gJobs.schedulerSync.stop();
+    gJobs.schedulerSync = new CronJob({
        cronTime: config.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
        onTick: scheduler.sync,
        start: true,
        timeZone: tz
    });

-    if (gCertificateRenewJob) gCertificateRenewJob.stop();
-    gCertificateRenewJob = new CronJob({
+    if (gJobs.certificateRenew) gJobs.certificateRenew.stop();
+    gJobs.certificateRenew = new CronJob({
        cronTime: '00 00 */12 * * *', // every 12 hours
-        onTick: certificates.renewAll.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
+        onTick: reverseProxy.renewAll.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
        start: true,
        timeZone: tz
    });

-    if (gDigestEmailJob) gDigestEmailJob.stop();
-    gDigestEmailJob = new CronJob({
+    if (gJobs.digestEmail) gJobs.digestEmail.stop();
+    gJobs.digestEmail = new CronJob({
        cronTime: '00 00 00 * * 3', // every wednesday
        onTick: digest.maybeSend,
        start: true,
@@ -189,15 +191,15 @@ function recreateJobs(tz) {

 function autoupdatePatternChanged(pattern) {
    assert.strictEqual(typeof pattern, 'string');
-    assert(gBoxUpdateCheckerJob);
+    assert(gJobs.boxUpdateCheckerJob);

    debug('Auto update pattern changed to %s', pattern);

-    if (gAutoupdaterJob) gAutoupdaterJob.stop();
+    if (gJobs.autoUpdater) gJobs.autoUpdater.stop();

    if (pattern === constants.AUTOUPDATE_PATTERN_NEVER) return;

-    gAutoupdaterJob = new CronJob({
+    gJobs.autoUpdater = new CronJob({
        cronTime: pattern,
        onTick: function() {
            var updateInfo = updateChecker.getUpdateInfo();
@@ -216,26 +218,26 @@ function autoupdatePatternChanged(pattern) {
            }
        },
        start: true,
-        timeZone: gBoxUpdateCheckerJob.cronTime.zone // hack
+        timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
    });
 }

-function dynamicDNSChanged(enabled) {
+function dynamicDnsChanged(enabled) {
    assert.strictEqual(typeof enabled, 'boolean');
-    assert(gBoxUpdateCheckerJob);
+    assert(gJobs.boxUpdateCheckerJob);

    debug('Dynamic DNS setting changed to %s', enabled);

    if (enabled) {
-        gDynamicDNSJob = new CronJob({
+        gJobs.dynamicDNS = new CronJob({
            cronTime: '00 */10 * * * *',
-            onTick: cloudron.refreshDNS,
+            onTick: dyndns.sync,
            start: true,
-            timeZone: gBoxUpdateCheckerJob.cronTime.zone // hack
+            timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
        });
    } else {
-        if (gDynamicDNSJob) gDynamicDNSJob.stop();
-        gDynamicDNSJob = null;
+        if (gJobs.dynamicDNS) gJobs.dynamicDNS.stop();
+        gJobs.dynamicDNS = null;
    }
 }

@@ -244,48 +246,13 @@ function uninitialize(callback) {

    settings.events.removeListener(settings.TIME_ZONE_KEY, recreateJobs);
    settings.events.removeListener(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
+    settings.events.removeListener(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);

-    if (gAutoupdaterJob) gAutoupdaterJob.stop();
-    gAutoupdaterJob = null;
-
-    if (gBoxUpdateCheckerJob) gBoxUpdateCheckerJob.stop();
-    gBoxUpdateCheckerJob = null;
-
-    if (gAppUpdateCheckerJob) gAppUpdateCheckerJob.stop();
-    gAppUpdateCheckerJob = null;
-
-    if (gCaasHeartbeatJob) gCaasHeartbeatJob.stop();
-    gCaasHeartbeatJob = null;
-
-    if (gAliveJob) gAliveJob.stop();
-    gAliveJob = null;
-
-    if (gBackupJob) gBackupJob.stop();
-    gBackupJob = null;
-
-    if (gCleanupTokensJob) gCleanupTokensJob.stop();
-    gCleanupTokensJob = null;
-
-    if (gCleanupBackupsJob) gCleanupBackupsJob.stop();
-    gCleanupBackupsJob = null;
-
-    if (gCleanupEventlogJob) gCleanupEventlogJob.stop();
-    gCleanupEventlogJob = null;
-
-    if (gDockerVolumeCleanerJob) gDockerVolumeCleanerJob.stop();
-    gDockerVolumeCleanerJob = null;
-
-    if (gSchedulerSyncJob) gSchedulerSyncJob.stop();
-    gSchedulerSyncJob = null;
-
-    if (gCertificateRenewJob) gCertificateRenewJob.stop();
-    gCertificateRenewJob = null;
-
-    if (gDynamicDNSJob) gDynamicDNSJob.stop();
-    gDynamicDNSJob = null;
-
-    if (gDigestEmailJob) gDigestEmailJob.stop();
-    gDigestEmailJob = null;
+    for (var job in gJobs) {
+        if (!gJobs[job]) continue;
+        gJobs[job].stop();
+        gJobs[job] = null;
+    }

    callback();
 }
@@ -10,6 +10,9 @@ exports = module.exports = {
    rollback: rollback,
    commit: commit,

+    importFromFile: importFromFile,
+    exportToFile: exportToFile,
+
    _clear: clear
 };

@@ -183,3 +186,27 @@ function transaction(queries, callback) {
    });
 }

+function importFromFile(file, callback) {
+    assert.strictEqual(typeof file, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+
+    var cmd = `/usr/bin/mysql -u ${config.database().username} ${password} ${config.database().name} < ${file}`;
+
+    async.series([
+        query.bind(null, 'CREATE DATABASE IF NOT EXISTS box'),
+        child_process.exec.bind(null, cmd)
+    ], callback);
+}
+
+function exportToFile(file, callback) {
+    assert.strictEqual(typeof file, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+    var cmd = `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
+            --triggers ${config.database().name} > "${file}"`;
+
+    child_process.exec(cmd, callback);
+}
@@ -5,8 +5,6 @@
 exports = module.exports = {
    DeveloperError: DeveloperError,

-    isEnabled: isEnabled,
-    setEnabled: setEnabled,
    issueDeveloperToken: issueDeveloperToken
 };

@@ -15,7 +13,6 @@ var assert = require('assert'),
    constants = require('./constants.js'),
    eventlog = require('./eventlog.js'),
    tokendb = require('./tokendb.js'),
-    settings = require('./settings.js'),
    util = require('util');

 function DeveloperError(reason, errorOrMessage) {
@@ -40,29 +37,6 @@ util.inherits(DeveloperError, Error);
 DeveloperError.INTERNAL_ERROR = 'Internal Error';
 DeveloperError.EXTERNAL_ERROR = 'External Error';

-function isEnabled(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDeveloperMode(function (error, enabled) {
-        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
-        callback(null, enabled);
-    });
-}
-
-function setEnabled(enabled, auditSource, callback) {
-    assert.strictEqual(typeof enabled, 'boolean');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.setDeveloperMode(enabled, function (error) {
-        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
-
-        eventlog.add(eventlog.ACTION_CLI_MODE, auditSource, { enabled: enabled });
-
-        callback(null);
-    });
-}
-
 function issueDeveloperToken(user, auditSource, callback) {
    assert.strictEqual(typeof user, 'object');
    assert.strictEqual(typeof auditSource, 'object');
@@ -11,10 +11,17 @@ exports = module.exports = {
 var assert = require('assert'),
    config = require('../config.js'),
    debug = require('debug')('box:dns/caas'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
    superagent = require('superagent'),
    util = require('util');

+function getFqdn(subdomain, domain) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+
+    return (subdomain === '') ? domain : subdomain + '-' + domain;
+}
+
 function add(dnsConfig, zoneName, subdomain, type, values, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneName, 'string');
@@ -23,9 +30,9 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + config.fqdn() : config.appFqdn(subdomain);
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);

-    debug('add: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
+    debug('add: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);

    var data = {
        type: type,
@@ -38,10 +45,10 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
        .send(data)
        .timeout(30 * 1000)
        .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
-            if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode === 400) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+            if (result.statusCode === 420) return callback(new DomainError(DomainError.STILL_BUSY));
+            if (result.statusCode !== 201) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));

            return callback(null, result.body.changeId);
        });
@@ -54,17 +61,17 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + config.fqdn() : config.appFqdn(subdomain);
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);

-    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', zoneName, subdomain, type, fqdn);
+    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', dnsConfig.fqdn, subdomain, type, fqdn);

    superagent
        .get(config.apiServerOrigin() + '/api/v1/domains/' + fqdn)
        .query({ token: dnsConfig.token, type: type })
        .timeout(30 * 1000)
        .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode !== 200) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));

            return callback(null, result.body.values);
        });
@@ -89,7 +96,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('del: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
+    debug('del: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);

    var data = {
        type: type,
@@ -97,16 +104,16 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
    };

    superagent
-        .del(config.apiServerOrigin() + '/api/v1/domains/' + config.appFqdn(subdomain))
+        .del(config.apiServerOrigin() + '/api/v1/domains/' + getFqdn(subdomain, dnsConfig.fqdn))
        .query({ token: dnsConfig.token })
        .send(data)
        .timeout(30 * 1000)
        .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
-            if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND));
-            if (result.statusCode !== 204) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode === 400) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+            if (result.statusCode === 420) return callback(new DomainError(DomainError.STILL_BUSY));
+            if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND));
+            if (result.statusCode !== 204) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));

            return callback(null);
        });
@@ -120,7 +127,8 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
    assert.strictEqual(typeof callback, 'function');

    var credentials = {
-        provider: dnsConfig.provider
+        token: dnsConfig.token,
+        fqdn: domain
    };

    return callback(null, credentials);
@@ -10,12 +10,12 @@ exports = module.exports = {

 var assert = require('assert'),
    async = require('async'),
-    dns = require('dns'),
-    _ = require('underscore'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
-    superagent = require('superagent'),
    debug = require('debug')('box:dns/cloudflare'),
-    util = require('util');
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
+    superagent = require('superagent'),
+    util = require('util'),
+    _ = require('underscore');

 // we are using latest v4 stable API https://api.cloudflare.com/#getting-started-endpoints
 var CLOUDFLARE_ENDPOINT = 'https://api.cloudflare.com/client/v4';
@@ -24,8 +24,8 @@ function translateRequestError(result, callback) {
    assert.strictEqual(typeof result, 'object');
    assert.strictEqual(typeof callback, 'function');

-    if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')));
-    if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
+    if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')));
+    if (result.statusCode === 422) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
    if ((result.statusCode === 400 || result.statusCode === 401 || result.statusCode === 403) && result.body.errors.length > 0) {
        let error = result.body.errors[0];
        let message = error.message;
@@ -34,10 +34,10 @@ function translateRequestError(result, callback) {
            else message = 'Invalid credentials';
        }

-        return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, message));
+        return callback(new DomainError(DomainError.ACCESS_DENIED, message));
    }

-    callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+    callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 }

 function getZoneByName(dnsConfig, zoneName, callback) {
@@ -46,16 +46,16 @@ function getZoneByName(dnsConfig, zoneName, callback) {
    assert.strictEqual(typeof callback, 'function');

    superagent.get(CLOUDFLARE_ENDPOINT + '/zones?name=' + zoneName + '&status=active')
-      .set('X-Auth-Key', dnsConfig.token)
-      .set('X-Auth-Email', dnsConfig.email)
-      .timeout(30 * 1000)
-      .end(function (error, result) {
-        if (error && !error.response) return callback(error);
-        if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
-        if (!result.body.result.length) return callback(new SubdomainError(SubdomainError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));
+        .set('X-Auth-Key', dnsConfig.token)
+        .set('X-Auth-Email', dnsConfig.email)
+        .timeout(30 * 1000)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(error);
+            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
+            if (!result.body.result.length) return callback(new DomainError(DomainError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));

-        callback(null, result.body.result[0]);
-    });
+            callback(null, result.body.result[0]);
+        });
 }

 function getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) {
@@ -69,18 +69,18 @@ function getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, cal
    var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;

    superagent.get(CLOUDFLARE_ENDPOINT + '/zones/' + zoneId + '/dns_records')
-      .set('X-Auth-Key',dnsConfig.token)
-      .set('X-Auth-Email',dnsConfig.email)
-      .query({ type: type, name: fqdn })
-      .timeout(30 * 1000)
-      .end(function (error, result) {
-        if (error && !error.response) return callback(error);
-        if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
+        .set('X-Auth-Key',dnsConfig.token)
+        .set('X-Auth-Email',dnsConfig.email)
+        .query({ type: type, name: fqdn })
+        .timeout(30 * 1000)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(error);
+            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-        var tmp = result.body.result;
+            var tmp = result.body.result;

-        return callback(null, tmp);
-    });
+            return callback(null, tmp);
+        });
 }

 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -126,31 +126,31 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {

                if (i >= dnsRecords.length) {
                    superagent.post(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records')
-                      .set('X-Auth-Key',dnsConfig.token)
-                      .set('X-Auth-Email',dnsConfig.email)
-                      .send(data)
-                      .timeout(30 * 1000)
-                      .end(function (error, result) {
-                        if (error && !error.response) return callback(error);
-                        if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
+                        .set('X-Auth-Key',dnsConfig.token)
+                        .set('X-Auth-Email',dnsConfig.email)
+                        .send(data)
+                        .timeout(30 * 1000)
+                        .end(function (error, result) {
+                            if (error && !error.response) return callback(error);
+                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-                        callback(null);
-                    });
+                            callback(null);
+                        });
                } else {
                    superagent.put(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records/' + dnsRecords[i].id)
-                      .set('X-Auth-Key',dnsConfig.token)
-                      .set('X-Auth-Email',dnsConfig.email)
-                      .send(data)
-                      .timeout(30 * 1000)
-                      .end(function (error, result) {
+                        .set('X-Auth-Key',dnsConfig.token)
+                        .set('X-Auth-Email',dnsConfig.email)
+                        .send(data)
+                        .timeout(30 * 1000)
+                        .end(function (error, result) {
                        // increment, as we have consumed the record
-                        ++i;
+                            ++i;

-                        if (error && !error.response) return callback(error);
-                        if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
+                            if (error && !error.response) return callback(error);
+                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-                        callback(null);
-                    });
+                            callback(null);
+                        });
                }
            }, function (error) {
                if (error) return callback(error);
@@ -206,17 +206,17 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {

            async.eachSeries(tmp, function (record, callback) {
                superagent.del(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records/' + record.id)
-                  .set('X-Auth-Key',dnsConfig.token)
-                  .set('X-Auth-Email',dnsConfig.email)
-                  .timeout(30 * 1000)
-                  .end(function (error, result) {
-                    if (error && !error.response) return callback(error);
-                    if (result.statusCode !== 204 || result.body.success !== true) return translateRequestError(result, callback);
+                    .set('X-Auth-Key',dnsConfig.token)
+                    .set('X-Auth-Email',dnsConfig.email)
+                    .timeout(30 * 1000)
+                    .end(function (error, result) {
+                        if (error && !error.response) return callback(error);
+                        if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-                    debug('del: done');
+                        debug('del: done');

-                    callback(null);
-                });
+                        callback(null);
+                    });
            }, function (error) {
                if (error) return callback(error);

@@ -233,11 +233,10 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'token must be a non-empty string'));
-    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'email must be a non-empty string'));
+    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainError(DomainError.BAD_FIELD, 'token must be a non-empty string'));
+    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new DomainError(DomainError.BAD_FIELD, 'email must be a non-empty string'));

    var credentials = {
-        provider: dnsConfig.provider,
        token: dnsConfig.token,
        email: dnsConfig.email
    };
@@ -245,23 +244,31 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

        getZoneByName(dnsConfig, zoneName, function(error, result) {
            if (error) return callback(error);

            if (!_.isEqual(result.name_servers.sort(), nameservers.sort())) {
                debug('verifyDnsConfig: %j and %j do not match', nameservers, result.name_servers);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
            }

-            upsert(credentials, zoneName, 'my', 'A', [ ip ], function (error, changeId) {
+            const testSubdomain = 'cloudrontestdns';
+
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
            });
        });
    });
@@ -10,11 +10,10 @@ exports = module.exports = {

 var assert = require('assert'),
    async = require('async'),
-    config = require('../config.js'),
    debug = require('debug')('box:dns/digitalocean'),
    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
    safe = require('safetydance'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
    superagent = require('superagent'),
    util = require('util');

@@ -40,10 +39,10 @@ function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
            .set('Authorization', 'Bearer ' + dnsConfig.token)
            .timeout(30 * 1000)
            .end(function (error, result) {
-                if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, formatError(result)));
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND, formatError(result)));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 200) return callback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));

                matchingRecords = matchingRecords.concat(result.body.domain_records.filter(function (record) {
                    return (record.type === type && record.name === subdomain);
@@ -80,7 +79,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
        // used to track available records to update instead of create
        var i = 0, recordIds = [];

-        async.eachSeries(values, function (value, callback) {
+        async.eachSeries(values, function (value, iteratorCallback) {
            var priority = null;

            if (type === 'MX') {
@@ -102,14 +101,14 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                    .send(data)
                    .timeout(30 * 1000)
                    .end(function (error, result) {
-                        if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                        if (error && !error.response) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                        if (result.statusCode === 422) return iteratorCallback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+                        if (result.statusCode !== 201) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));

                        recordIds.push(safe.query(result.body, 'domain_record.id'));

-                        return callback(null);
+                        return iteratorCallback(null);
                    });
            } else {
                superagent.put(DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records/' + result[i].id)
@@ -120,17 +119,17 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                    // increment, as we have consumed the record
                        ++i;

-                        if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                        if (error && !error.response) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                        if (result.statusCode === 422) return iteratorCallback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+                        if (result.statusCode !== 200) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));

                        recordIds.push(safe.query(result.body, 'domain_record.id'));

-                        return callback(null);
+                        return iteratorCallback(null);
                    });
            }
-        }, function (error, id) {
+        }, function (error) {
            if (error) return callback(error);

            callback(null, '' + recordIds[0]); // DO ids are integers
@@ -186,10 +185,10 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
            .set('Authorization', 'Bearer ' + dnsConfig.token)
            .timeout(30 * 1000)
            .end(function (error, result) {
-                if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                if (result.statusCode === 404) return callback(null);
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 204) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 204) return callback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));

                debug('del: done');

@@ -206,29 +205,34 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    assert.strictEqual(typeof callback, 'function');

    var credentials = {
-        provider: dnsConfig.provider,
        token: dnsConfig.token
    };

    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

        if (nameservers.map(function (n) { return n.toLowerCase(); }).indexOf('ns1.digitalocean.com') === -1) {
            debug('verifyDnsConfig: %j does not contains DO NS', nameservers);
-            return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
+            return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
        }

-        const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+        const testSubdomain = 'cloudrontestdns';

-        upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
            if (error) return callback(error);

-            debug('verifyDnsConfig: A record added with change id %s', changeId);
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-            callback(null, credentials);
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                if (error) return callback(error);
+
+                debug('verifyDnsConfig: Test A record removed again');
+
+                callback(null, credentials);
+            });
        });
    });
 }
@@ -9,11 +9,10 @@ exports = module.exports = {
 };

 var assert = require('assert'),
-    config = require('../config.js'),
    debug = require('debug')('box:dns/gcdns'),
    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
    GCDNS = require('@google-cloud/dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
    util = require('util'),
    _ = require('underscore');

@@ -21,7 +20,6 @@ function getDnsCredentials(dnsConfig) {
    assert.strictEqual(typeof dnsConfig, 'object');

    var config = {
-        provider: dnsConfig.provider,
        projectId: dnsConfig.projectId,
        keyFilename: dnsConfig.keyFilename,
        email: dnsConfig.email
@@ -44,20 +42,20 @@ function getZoneByName(dnsConfig, zoneName, callback) {
    var gcdns = GCDNS(getDnsCredentials(dnsConfig));

    gcdns.getZones(function (error, zones) {
-        if (error && error.message === 'invalid_grant') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, 'The key was probably revoked'));
-        if (error && error.reason === 'No such domain') return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
-        if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error && error.code === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+        if (error && error.message === 'invalid_grant') return callback(new DomainError(DomainError.ACCESS_DENIED, 'The key was probably revoked'));
+        if (error && error.reason === 'No such domain') return callback(new DomainError(DomainError.NOT_FOUND, error.message));
+        if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error && error.code === 404) return callback(new DomainError(DomainError.NOT_FOUND, error.message));
        if (error) {
            debug('gcdns.getZones', error);
-            return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+            return callback(new DomainError(DomainError.EXTERNAL_ERROR, error));
        }

        var zone = zones.filter(function (zone) {
            return zone.metadata.dnsName.slice(0, -1) === zoneName;     // the zone name contains a '.' at the end
        })[0];

-        if (!zone) return callback(new SubdomainError(SubdomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainError(DomainError.NOT_FOUND, 'no such zone'));

        callback(null, zone); //zone.metadata ~= {name="", dnsName="", nameServers:[]}
    });
@@ -79,10 +77,10 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';

        zone.getRecords({ type: type, name: domain }, function (error, oldRecords) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
            if (error) {
                debug('upsert->zone.getRecords', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
            }

            var newRecord = zone.record(type, {
@@ -92,11 +90,11 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
            });

            zone.createChange({ delete: oldRecords, add: newRecord }, function(error, change) {
-                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new DomainError(DomainError.STILL_BUSY, error.message));
                if (error) {
                    debug('upsert->zone.createChange', error);
-                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                }

                callback(null, change.id);
@@ -121,8 +119,8 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
        };

        zone.getRecords(params, function (error, records) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error));
            if (records.length === 0) return callback(null, [ ]);

            return callback(null, records[0].data);
@@ -144,18 +142,18 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';

        zone.getRecords({ type: type, name: domain }, function(error, oldRecords) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
            if (error) {
                debug('del->zone.getRecords', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
            }

            zone.deleteRecords(oldRecords, function (error, change) {
-                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new DomainError(DomainError.STILL_BUSY, error.message));
                if (error) {
                    debug('del->zone.createChange', error);
-                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                }

                callback(null, change.id);
@@ -175,8 +173,8 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolveNs(zoneName, function (error, resolvedNS) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !resolvedNS) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !resolvedNS) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

        getZoneByName(credentials, zoneName, function (error, zone) {
            if (error) return callback(error);
@@ -184,17 +182,23 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
            var definedNS = zone.metadata.nameServers.sort().map(function(r) { return r.replace(/\.$/, ''); });
            if (!_.isEqual(definedNS, resolvedNS.sort())) {
                debug('verifyDnsConfig: %j and %j do not match', resolvedNS, definedNS);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
            }

-            const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+            const testSubdomain = 'cloudrontestdns';

-            upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
            });
        });
    });
@@ -15,7 +15,7 @@ exports = module.exports = {
 };

 var assert = require('assert'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
    util = require('util');

 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -9,12 +9,9 @@ exports = module.exports = {
 };

 var assert = require('assert'),
-    async = require('async'),
-    config = require('../config.js'),
    debug = require('debug')('box:dns/manual'),
-    dig = require('../dig.js'),
    dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
    util = require('util');

 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -58,50 +55,10 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var adminDomain = config.adminLocation() + '.' + domain;
-
+    // Very basic check if the nameservers can be fetched
    dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to get nameservers'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to get nameservers'));

-        async.every(nameservers, function (nameserver, everyNsCallback) {
-            // ns records cannot have cname
-            dns.resolve4(nameserver, function (error, nsIps) {
-                if (error || !nsIps || nsIps.length === 0) {
-                    return everyNsCallback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-                }
-
-                async.every(nsIps, function (nsIp, everyIpCallback) {
-                    dig.resolve(adminDomain, 'A', { server: nsIp, timeout: 5000 }, function (error, answer) {
-                        if (error && error.code === 'ETIMEDOUT') {
-                            debug('nameserver %s (%s) timed out when trying to resolve %s', nameserver, nsIp, adminDomain);
-                            return everyIpCallback(null, true); // should be ok if dns server is down
-                        }
-
-                        if (error) {
-                            debug('nameserver %s (%s) returned error trying to resolve %s: %s', nameserver, nsIp, adminDomain, error);
-                            return everyIpCallback(null, false);
-                        }
-
-                        if (!answer || answer.length === 0) {
-                            debug('bad answer from nameserver %s (%s) resolving %s (%s): %j', nameserver, nsIp, adminDomain, 'A', answer);
-                            return everyIpCallback(null, false);
-                        }
-
-                        debug('verifyDnsConfig: ns: %s (%s), name:%s Actual:%j Expecting:%s', nameserver, nsIp, adminDomain, answer, ip);
-
-                        var match = answer.some(function (a) { return a === ip; });
-
-                        if (match) return everyIpCallback(null, true); // done!
-
-                        everyIpCallback(null, false);
-                    });
-                }, everyNsCallback);
-            });
-        }, function (error, success) {
-            if (error) return callback(error);
-            if (!success) return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'The domain ' + adminDomain + ' does not resolve to the server\'s IP ' + ip));
-
-            callback(null, { provider: dnsConfig.provider, wildcard: !!dnsConfig.wildcard });
-        });
+        callback(null, { wildcard: !!dnsConfig.wildcard });
    });
 }
@@ -64,9 +64,5 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var credentials = {
-        provider: dnsConfig.provider
-    };
-
-    return callback(null, credentials);
+    return callback(null, { });
 }
@@ -16,7 +16,7 @@ var assert = require('assert'),
    config = require('../config.js'),
    debug = require('debug')('box:dns/route53'),
    dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
    util = require('util'),
    _ = require('underscore');

@@ -41,15 +41,15 @@ function getZoneByName(dnsConfig, zoneName, callback) {

    var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
    route53.listHostedZones({}, function (error, result) {
-        if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+        if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));

        var zone = result.HostedZones.filter(function (zone) {
            return zone.Name.slice(0, -1) === zoneName;     // aws zone name contains a '.' at the end
        })[0];

-        if (!zone) return callback(new SubdomainError(SubdomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainError(DomainError.NOT_FOUND, 'no such zone'));

        callback(null, zone);
    });
@@ -65,9 +65,9 @@ function getHostedZone(dnsConfig, zoneName, callback) {

        var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
        route53.getHostedZone({ Id: zone.Id }, function (error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));

            callback(null, result);
        });
@@ -107,11 +107,11 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {

        var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
        route53.changeResourceRecordSets(params, function(error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'PriorRequestNotComplete') return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
-            if (error && error.code === 'InvalidChangeBatch') return callback(new SubdomainError(SubdomainError.BAD_FIELD, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'PriorRequestNotComplete') return callback(new DomainError(DomainError.STILL_BUSY, error.message));
+            if (error && error.code === 'InvalidChangeBatch') return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));

            callback(null, result.ChangeInfo.Id);
        });
@@ -148,9 +148,9 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {

        var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
        route53.listResourceRecordSets(params, function (error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
            if (result.ResourceRecordSets.length === 0) return callback(null, [ ]);
            if (result.ResourceRecordSets[0].Name !== params.StartRecordName || result.ResourceRecordSets[0].Type !== params.StartRecordType) return callback(null, [ ]);

@@ -194,23 +194,23 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {

        var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
        route53.changeResourceRecordSets(params, function(error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
            if (error && error.message && error.message.indexOf('it was not found') !== -1) {
                debug('del: resource record set not found.', error);
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
            } else if (error && error.code === 'NoSuchHostedZone') {
                debug('del: hosted zone not found.', error);
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
            } else if (error && error.code === 'PriorRequestNotComplete') {
                debug('del: resource is still busy', error);
-                return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                return callback(new DomainError(DomainError.STILL_BUSY, error.message));
            } else if (error && error.code === 'InvalidChangeBatch') {
                debug('del: invalid change batch. No such record to be deleted.');
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
            } else if (error) {
                debug('del: error', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
            }

            callback(null);
@@ -226,7 +226,6 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    assert.strictEqual(typeof callback, 'function');

    var credentials = {
-        provider: dnsConfig.provider,
        accessKeyId: dnsConfig.accessKeyId,
        secretAccessKey: dnsConfig.secretAccessKey,
        region: dnsConfig.region || 'us-east-1',
@@ -236,25 +235,31 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

        getHostedZone(credentials, zoneName, function (error, zone) {
            if (error) return callback(error);

            if (!_.isEqual(zone.DelegationSet.NameServers.sort(), nameservers.sort())) {
                debug('verifyDnsConfig: %j and %j do not match', nameservers, zone.DelegationSet.NameServers);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
            }

-            const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+            const testSubdomain = 'cloudrontestdns';

-            upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
            });
        });
    });
@@ -7,7 +7,7 @@ var assert = require('assert'),
    debug = require('debug')('box:dns/waitfordns'),
    dig = require('../dig.js'),
    dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
    util = require('util');

 function isChangeSynced(domain, value, type, nameserver, callback) {
@@ -56,7 +56,7 @@ function isChangeSynced(domain, value, type, nameserver, callback) {
        }, callback);

    });
- }
+}

 // check if IP change has propagated to every nameserver
 function waitForDns(domain, zoneName, value, type, options, callback) {
@@ -76,22 +76,22 @@ function waitForDns(domain, zoneName, value, type, options, callback) {

    var attempt = 1;
    async.retry(options, function (retryCallback) {
-        debug('waitForDNS: %s attempt %s.', domain, attempt++);
+        debug('waitForDNS: %s (zone: %s) attempt %s.', domain, zoneName, attempt++);

        dns.resolveNs(zoneName, function (error, nameservers) {
-            if (error || !nameservers) return retryCallback(error || new SubdomainError(SubdomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));
+            if (error || !nameservers) return retryCallback(error || new DomainError(DomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));

            async.every(nameservers, isChangeSynced.bind(null, domain, value, type), function (error, synced) {
                debug('waitForIp: %s %s ns: %j', domain, synced ? 'done' : 'not done', nameservers);

-                retryCallback(synced ? null : new SubdomainError(SubdomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
+                retryCallback(synced ? null : new DomainError(DomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
            });
        });
    }, function retryDone(error) {
-         if (error) return callback(error);
+        if (error) return callback(error);

        debug('waitForDNS: %s done.', domain);

        callback(null);
-     });
+    });
 }
@@ -51,7 +51,7 @@ var addons = require('./addons.js'),
 function debugApp(app, args) {
    assert(!app || typeof app === 'object');

-    var prefix = app ? (app.location || '(bare)') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }

@@ -129,7 +129,7 @@ function createSubcontainer(app, name, cmd, options, callback) {

    var manifest = app.manifest;
    var exposedPorts = {}, dockerPortBindings = { };
-    var domain = app.altDomain || config.appFqdn(app.location);
+    var domain = app.altDomain || app.intrinsicFqdn;
    var stdEnv = [
        'CLOUDRON=1',
        'WEBADMIN_ORIGIN=' + config.adminOrigin(),
@@ -186,7 +186,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
                '/run': {}
            },
            Labels: {
-                'location': app.location,
+                'fqdn': app.intrinsicFqdn,
                'appId': app.id,
                'isSubcontainer': String(!isAppContainer)
            },
@@ -369,19 +369,13 @@ function getContainerIdByIp(ip, callback) {

    var docker = exports.connection;

-    docker.listNetworks({}, function (error, result) {
+    docker.getNetwork('cloudron').inspect(function (error, bridge) {
+        if (error && error.statusCode === 404) return callback(new Error('Unable to find the cloudron network'));
        if (error) return callback(error);

-        var bridge;
-        result.forEach(function (n) {
-            if (n.Name === 'cloudron') bridge = n;
-        });
-
-        if (!bridge) return callback(new Error('Unable to find the cloudron network'));
-
        var containerId;
        for (var id in bridge.Containers) {
-            if (bridge.Containers[id].IPv4Address.indexOf(ip) === 0) {
+            if (bridge.Containers[id].IPv4Address.indexOf(ip + '/16') === 0) {
                containerId = id;
                break;
            }
@@ -0,0 +1,119 @@
+/* jslint node:true */
+
+'use strict';
+
+exports = module.exports = {
+    add: add,
+    get: get,
+    getAll: getAll,
+    update: update,
+    del: del,
+
+    _clear: clear
+};
+
+var assert = require('assert'),
+    database = require('./database.js'),
+    DatabaseError = require('./databaseerror'),
+    safe = require('safetydance');
+
+var DOMAINS_FIELDS = [ 'domain', 'zoneName', 'provider', 'configJson', 'tlsConfigJson' ].join(',');
+
+function postProcess(data) {
+    data.config = safe.JSON.parse(data.configJson);
+    data.tlsConfig = safe.JSON.parse(data.tlsConfigJson);
+    delete data.configJson;
+    delete data.tlsConfigJson;
+
+    return data;
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query(`SELECT ${DOMAINS_FIELDS} FROM domains WHERE domain=?`, [ domain ], function (error, result) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        postProcess(result[0]);
+
+        callback(null, result[0]);
+    });
+}
+
+function getAll(callback) {
+    database.query(`SELECT ${DOMAINS_FIELDS} FROM domains ORDER BY domain`, function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        results.forEach(postProcess);
+
+        callback(null, results);
+    });
+}
+
+function add(name, domain, callback) {
+    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'object');
+    assert.strictEqual(typeof domain.zoneName, 'string');
+    assert.strictEqual(typeof domain.provider, 'string');
+    assert.strictEqual(typeof domain.config, 'object');
+    assert.strictEqual(typeof domain.tlsConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('INSERT INTO domains (domain, zoneName, provider, configJson, tlsConfigJson) VALUES (?, ?, ?, ?, ?)', [ name, domain.zoneName, domain.provider, JSON.stringify(domain.config), JSON.stringify(domain.tlsConfig) ], function (error) {
+        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function update(name, domain, callback) {
+    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var args = [ ], fields = [ ];
+    for (var k in domain) {
+        if (k === 'config') {
+            fields.push('configJson = ?');
+            args.push(JSON.stringify(domain[k]));
+        } else if (k === 'tlsConfig') {
+            fields.push('tlsConfigJson = ?');
+            args.push(JSON.stringify(domain[k]));
+        } else {
+            fields.push(k + ' = ?');
+            args.push(domain[k]);
+        }
+    }
+    args.push(name);
+
+    database.query('UPDATE domains SET ' + fields.join(', ') + ' WHERE domain=?', args, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('DELETE FROM domains WHERE domain=?', [ domain ], function (error, result) {
+        if (error && error.code === 'ER_ROW_IS_REFERENCED_2') return callback(new DatabaseError(DatabaseError.IN_USE));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null);
+    });
+}
+
+function clear(callback) {
+    database.query('DELETE FROM domains', function (error) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(error);
+    });
+}
@@ -0,0 +1,363 @@
+'use strict';
+
+module.exports = exports = {
+    add: add,
+    get: get,
+    getAll: getAll,
+    update: update,
+    del: del,
+
+    fqdn: fqdn,
+    setAdmin: setAdmin,
+
+    getDNSRecords: getDNSRecords,
+    upsertDNSRecords: upsertDNSRecords,
+    removeDNSRecords: removeDNSRecords,
+
+    waitForDNSRecord: waitForDNSRecord,
+
+    DomainError: DomainError
+};
+
+var assert = require('assert'),
+    caas = require('./caas.js'),
+    config = require('./config.js'),
+    DatabaseError = require('./databaseerror.js'),
+    debug = require('debug')('box:domains'),
+    domaindb = require('./domaindb.js'),
+    path = require('path'),
+    reverseProxy = require('./reverseproxy.js'),
+    ReverseProxyError = reverseProxy.ReverseProxyError,
+    safe = require('safetydance'),
+    shell = require('./shell.js'),
+    sysinfo = require('./sysinfo.js'),
+    tld = require('tldjs'),
+    util = require('util');
+
+var RESTART_CMD = path.join(__dirname, 'scripts/restart.sh');
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function DomainError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(DomainError, Error);
+
+DomainError.NOT_FOUND = 'No such domain';
+DomainError.ALREADY_EXISTS = 'Domain already exists';
+DomainError.EXTERNAL_ERROR = 'External error';
+DomainError.BAD_FIELD = 'Bad Field';
+DomainError.STILL_BUSY = 'Still busy';
+DomainError.IN_USE = 'In Use';
+DomainError.INTERNAL_ERROR = 'Internal error';
+DomainError.ACCESS_DENIED = 'Access denied';
+DomainError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, cloudflare, noop, manual or caas';
+
+// choose which subdomain backend we use for test purpose we use route53
+function api(provider) {
+    assert.strictEqual(typeof provider, 'string');
+
+    switch (provider) {
+    case 'caas': return require('./dns/caas.js');
+    case 'cloudflare': return require('./dns/cloudflare.js');
+    case 'route53': return require('./dns/route53.js');
+    case 'gcdns': return require('./dns/gcdns.js');
+    case 'digitalocean': return require('./dns/digitalocean.js');
+    case 'noop': return require('./dns/noop.js');
+    case 'manual': return require('./dns/manual.js');
+    default: return null;
+    }
+}
+
+function verifyDnsConfig(config, domain, zoneName, provider, ip, callback) {
+    assert(config && typeof config === 'object'); // the dns config to test with
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof ip, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var backend = api(provider);
+    if (!backend) return callback(new DomainError(DomainError.INVALID_PROVIDER));
+
+    api(provider).verifyDnsConfig(config, domain, zoneName, ip, callback);
+}
+
+
+function add(domain, zoneName, provider, config, fallbackCertificate, tlsConfig, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof fallbackCertificate, 'object');
+    assert.strictEqual(typeof tlsConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!tld.isValid(domain)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid domain'));
+
+    if (zoneName) {
+        if (!tld.isValid(zoneName)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid zoneName'));
+    } else {
+        zoneName = tld.getDomain(domain) || domain;
+    }
+
+    if (fallbackCertificate) {
+        let error = reverseProxy.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+        if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+    }
+
+    if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
+        return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or le-*'));
+    }
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+
+        verifyDnsConfig(config, domain, zoneName, provider, ip, function (error, result) {
+            if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
+            if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
+            if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+            domaindb.add(domain, { zoneName: zoneName, provider: provider, config: result, tlsConfig: tlsConfig }, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainError(DomainError.ALREADY_EXISTS));
+                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                    callback();
+                });
+            });
+        });
+    });
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.get(domain, function (error, result) {
+        // TODO try to find subdomain entries maybe based on zoneNames or so
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        reverseProxy.getFallbackCertificate(domain, function (error, bundle) {
+            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+            var cert = safe.fs.readFileSync(bundle.certFilePath, 'utf-8');
+            var key = safe.fs.readFileSync(bundle.keyFilePath, 'utf-8');
+
+            if (!cert || !key) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+            result.fallbackCertificate = { cert: cert, key: key };
+
+            return callback(null, result);
+        });
+    });
+}
+
+function getAll(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.getAll(function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        return callback(null, result);
+    });
+}
+
+function update(domain, provider, config, fallbackCertificate, tlsConfig, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof fallbackCertificate, 'object');
+    assert.strictEqual(typeof tlsConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.get(domain, function (error, result) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        if (fallbackCertificate) {
+            let error = reverseProxy.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+            if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+        }
+
+        if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
+            return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or letsencrypt-*'));
+        }
+
+        sysinfo.getPublicIp(function (error, ip) {
+            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+
+            verifyDnsConfig(config, domain, result.zoneName, provider, ip, function (error, result) {
+                if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
+                if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
+                if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
+                if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+                if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                domaindb.update(domain, { provider: provider, config: result, tlsConfig: tlsConfig }, function (error) {
+                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                    if (!fallbackCertificate) return callback();
+
+                    reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+                        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                        callback();
+                    });
+                });
+            });
+        });
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.del(domain, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error && error.reason === DatabaseError.IN_USE) return callback(new DomainError(DomainError.IN_USE));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        return callback(null);
+    });
+}
+
+function getName(domain, subdomain) {
+    // support special caas domains
+    if (domain.provider === 'caas') return subdomain;
+
+    if (domain.domain === domain.zoneName) return subdomain;
+
+    var part = domain.domain.slice(0, -domain.zoneName.length - 1);
+
+    return subdomain === '' ? part : subdomain + '.' + part;
+}
+
+function getDNSRecords(subdomain, domain, type, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    get(domain, function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        api(result.provider).get(result.config, result.zoneName, getName(result, subdomain), type, function (error, values) {
+            if (error) return callback(error);
+
+            callback(null, values);
+        });
+    });
+}
+
+function upsertDNSRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('upsertDNSRecord: %s on %s type %s values', subdomain, domain, type, values);
+
+    get(domain, function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        api(result.provider).upsert(result.config, result.zoneName, getName(result, subdomain), type, values, function (error, changeId) {
+            if (error) return callback(error);
+
+            callback(null, changeId);
+        });
+    });
+}
+
+function removeDNSRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('removeDNSRecord: %s on %s type %s values', subdomain, domain, type, values);
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        api(result.provider).del(result.config, result.zoneName, getName(result, subdomain), type, values, function (error) {
+            if (error && error.reason !== DomainError.NOT_FOUND) return callback(error);
+
+            callback(null);
+        });
+    });
+}
+
+function waitForDNSRecord(fqdn, domain, value, type, options, callback) {
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert(typeof value === 'string' || util.isRegExp(value));
+    assert(type === 'A' || type === 'CNAME' || type === 'TXT');
+    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+    assert.strictEqual(typeof callback, 'function');
+
+    get(domain, function (error, result) {
+        // domain can be not found when waiting for altDomain. When we migrate altDomain, this can never happen
+        if (error && error.reason !== DomainError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        // hack for lack of provider with altDomain. When we migrate altDomain, this will be automatically "manual"
+        const provider = result ? result.provider : 'manual';
+
+        api(provider).waitForDns(fqdn, result ? result.zoneName : domain, value, type, options, callback);
+    });
+}
+
+function setAdmin(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('setAdmin domain:%s', domain);
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        var setPtrRecord = config.provider() === 'caas' ? caas.setPtrRecord : function (d, next) { next(); };
+
+        setPtrRecord(domain, function (error) {
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
+
+            config.setAdminDomain(result.domain);
+            config.setAdminLocation('my');
+            config.setAdminFqdn('my' + (result.provider === 'caas' ? '-' : '.') + result.domain);
+
+            callback();
+
+            shell.sudo('restart', [ RESTART_CMD ], NOOP_CALLBACK);
+        });
+    });
+}
+
+function fqdn(location, domain, provider) {
+    return location + (location ? (provider !== 'caas' ? '.' : '-') : '') + domain;
+}
+
@@ -0,0 +1,49 @@
+'use strict';
+
+exports = module.exports = {
+    sync: sync
+};
+
+var appdb = require('./appdb.js'),
+    apps = require('./apps.js'),
+    async = require('async'),
+    config = require('./config.js'),
+    debug = require('debug')('box:dyndns'),
+    domains = require('./domains.js'),
+    sysinfo = require('./sysinfo.js');
+
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+// called for dynamic dns setups where we have to update the IP
+function sync(callback) {
+    callback = callback || NOOP_CALLBACK;
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error);
+
+        debug('refreshDNS: current ip %s', ip);
+
+        domains.upsertDNSRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
+            if (error) return callback(error);
+
+            debug('refreshDNS: done for admin location');
+
+            apps.getAll(function (error, result) {
+                if (error) return callback(error);
+
+                async.each(result, function (app, callback) {
+                    // do not change state of installing apps since apptask will error if dns record already exists
+                    if (app.installationState !== appdb.ISTATE_INSTALLED) return callback();
+
+                    domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], callback);
+                }, function (error) {
+                    if (error) return callback(error);
+
+                    debug('refreshDNS: done for apps');
+
+                    callback();
+                });
+            });
+        });
+    });
+}
@@ -1,402 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    verifyRelay: verifyRelay,
-    getStatus: getStatus,
-    checkRblStatus: checkRblStatus,
-
-    EmailError: EmailError
-};
-
-var assert = require('assert'),
-    async = require('async'),
-    cloudron = require('./cloudron.js'),
-    config = require('./config.js'),
-    constants = require('./constants.js'),
-    debug = require('debug')('box:email'),
-    dig = require('./dig.js'),
-    mailer = require('./mailer.js'),
-    net = require('net'),
-    nodemailer = require('nodemailer'),
-    safe = require('safetydance'),
-    settings = require('./settings.js'),
-    smtpTransport = require('nodemailer-smtp-transport'),
-    sysinfo = require('./sysinfo.js'),
-    util = require('util'),
-    _ = require('underscore');
-
-var NOOP_CALLBACK = function (error) { if (error) console.error(error); };
-
-const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
-
-function EmailError(reason, errorOrMessage) {
-    assert.strictEqual(typeof reason, 'string');
-    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
-
-    Error.call(this);
-    Error.captureStackTrace(this, this.constructor);
-
-    this.name = this.constructor.name;
-    this.reason = reason;
-    if (typeof errorOrMessage === 'undefined') {
-        this.message = reason;
-    } else if (typeof errorOrMessage === 'string') {
-        this.message = errorOrMessage;
-    } else {
-        this.message = 'Internal error';
-        this.nestedError = errorOrMessage;
-    }
-}
-util.inherits(EmailError, Error);
-EmailError.INTERNAL_ERROR = 'Internal Error';
-EmailError.BAD_FIELD = 'Bad Field';
-
-function checkOutboundPort25(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    var smtpServer = _.sample([
-        'smtp.gmail.com',
-        'smtp.live.com',
-        'smtp.mail.yahoo.com',
-        'smtp.o2.ie',
-        'smtp.comcast.net',
-        'outgoing.verizon.net'
-    ]);
-
-    var relay = {
-        value: 'OK',
-        status: false
-    };
-
-    var client = new net.Socket();
-    client.setTimeout(5000);
-    client.connect(25, smtpServer);
-    client.on('connect', function () {
-        relay.status = true;
-        relay.value = 'OK';
-        client.destroy(); // do not use end() because it still triggers timeout
-        callback(null, relay);
-    });
-    client.on('timeout', function () {
-        relay.status = false;
-        relay.value = 'Connect to ' + smtpServer + ' timed out';
-        client.destroy();
-        callback(new Error('Timeout'), relay);
-    });
-    client.on('error', function (error) {
-        relay.status = false;
-        relay.value = 'Connect to ' + smtpServer + ' failed: ' + error.message;
-        client.destroy();
-        callback(error, relay);
-    });
-}
-
-function checkSmtpRelay(relay, callback) {
-    var result = {
-        value: 'OK',
-        status: false
-    };
-
-    var transporter = nodemailer.createTransport(smtpTransport({
-        host: relay.host,
-        port: relay.port,
-        auth: {
-            user: relay.username,
-            pass: relay.password
-        }
-    }));
-
-    transporter.verify(function(error) {
-        result.status = !error;
-        if (error) {
-            result.value = error.message;
-            return callback(error, result);
-        }
-
-       callback(null, result);
-    });
-}
-
-function verifyRelay(relay, callback) {
-    assert.strictEqual(typeof relay, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    var verifier = relay.provider === 'cloudron-smtp' ? checkOutboundPort25 : checkSmtpRelay.bind(null, relay);
-
-    verifier(function (error) {
-        if (error) return callback(new EmailError(EmailError.BAD_FIELD, error.message));
-
-        callback();
-    });
-}
-
-function checkDkim(callback) {
-    var dkim = {
-        domain: config.dkimSelector() + '._domainkey.' + config.fqdn(),
-        type: 'TXT',
-        expected: null,
-        value: null,
-        status: false
-    };
-
-    var dkimKey = cloudron.readDkimPublicKeySync();
-    if (!dkimKey) return callback(new Error('Failed to read dkim public key'), dkim);
-
-    dkim.expected = '"v=DKIM1; t=s; p=' + dkimKey + '"';
-
-    dig.resolve(dkim.domain, dkim.type, digOptions, function (error, txtRecords) {
-        if (error && error.code === 'ENOTFOUND') return callback(null, dkim);    // not setup
-        if (error) return callback(error, dkim);
-
-        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
-            dkim.value = txtRecords[0];
-            dkim.status = (dkim.value === dkim.expected);
-        }
-
-        callback(null, dkim);
-    });
-}
-
-function checkSpf(callback) {
-    var spf = {
-        domain: config.fqdn(),
-        type: 'TXT',
-        value: null,
-        expected: '"v=spf1 a:' + config.adminFqdn() + ' ~all"',
-        status: false
-    };
-
-    // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
-    dig.resolve(spf.domain, spf.type, digOptions, function (error, txtRecords) {
-        if (error && error.code === 'ENOTFOUND') return callback(null, spf);    // not setup
-        if (error) return callback(error, spf);
-
-        if (!Array.isArray(txtRecords)) return callback(null, spf);
-
-        var i;
-        for (i = 0; i < txtRecords.length; i++) {
-            if (txtRecords[i].indexOf('"v=spf1 ') !== 0) continue; // not SPF
-            spf.value = txtRecords[i];
-            spf.status = spf.value.indexOf(' a:' + config.adminFqdn()) !== -1;
-            break;
-        }
-
-        if (spf.status) {
-            spf.expected = spf.value;
-        } else if (i !== txtRecords.length) {
-            spf.expected = '"v=spf1 a:' + config.adminFqdn() + ' ' + spf.value.slice('"v=spf1 '.length);
-        }
-
-        callback(null, spf);
-    });
-}
-
-function checkMx(callback) {
-    var mx = {
-        domain: config.fqdn(),
-        type: 'MX',
-        value: null,
-        expected: '10 ' + config.mailFqdn() + '.',
-        status: false
-    };
-
-    dig.resolve(mx.domain, mx.type, digOptions, function (error, mxRecords) {
-        if (error && error.code === 'ENOTFOUND') return callback(null, mx);    // not setup
-        if (error) return callback(error, mx);
-
-        if (Array.isArray(mxRecords) && mxRecords.length !== 0) {
-            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === (config.mailFqdn() + '.');
-            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange; }).join(' ');
-        }
-
-        callback(null, mx);
-    });
-}
-
-function checkDmarc(callback) {
-    var dmarc = {
-        domain: '_dmarc.' + config.fqdn(),
-        type: 'TXT',
-        value: null,
-        expected: '"v=DMARC1; p=reject; pct=100"',
-        status: false
-    };
-
-    dig.resolve(dmarc.domain, dmarc.type, digOptions, function (error, txtRecords) {
-        if (error && error.code === 'ENOTFOUND') return callback(null, dmarc);    // not setup
-        if (error) return callback(error, dmarc);
-
-        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
-            dmarc.value = txtRecords[0];
-            dmarc.status = (dmarc.value === dmarc.expected);
-        }
-
-        callback(null, dmarc);
-    });
-}
-
-function checkPtr(callback) {
-    var ptr = {
-        domain: null,
-        type: 'PTR',
-        value: null,
-        expected: config.mailFqdn() + '.',
-        status: false
-    };
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(error, ptr);
-
-        ptr.domain = ip.split('.').reverse().join('.') + '.in-addr.arpa';
-
-        dig.resolve(ip, 'PTR', digOptions, function (error, ptrRecords) {
-            if (error && error.code === 'ENOTFOUND') return callback(null, ptr);    // not setup
-            if (error) return callback(error, ptr);
-
-            if (Array.isArray(ptrRecords) && ptrRecords.length !== 0) {
-                ptr.value = ptrRecords.join(' ');
-                ptr.status = ptrRecords.some(function (v) { return v === ptr.expected; });
-            }
-
-            return callback(null, ptr);
-        });
-    });
-}
-
-// https://raw.githubusercontent.com/jawsome/node-dnsbl/master/list.json
-const RBL_LIST = [
-    {
-        "name": "Barracuda",
-        "dns": "b.barracudacentral.org",
-        "site": "http://www.barracudacentral.org/rbl/removal-request"
-    },
-    {
-        "name": "SpamCop",
-        "dns": "bl.spamcop.net",
-        "site": "http://spamcop.net"
-    },
-    {
-        "name": "Sorbs Aggregate Zone",
-        "dns": "dnsbl.sorbs.net",
-        "site": "http://dnsbl.sorbs.net/"
-    },
-    {
-        "name": "Sorbs spam.dnsbl Zone",
-        "dns": "spam.dnsbl.sorbs.net",
-        "site": "http://sorbs.net"
-    },
-    {
-        "name": "Composite Blocking List",
-        "dns": "cbl.abuseat.org",
-        "site": "http://www.abuseat.org"
-    },
-    {
-        "name": "SpamHaus Zen",
-        "dns": "zen.spamhaus.org",
-        "site": "http://spamhaus.org"
-    },
-    {
-        "name": "Multi SURBL",
-        "dns": "multi.surbl.org",
-        "site": "http://www.surbl.org"
-    },
-    {
-        "name": "Spam Cannibal",
-        "dns": "bl.spamcannibal.org",
-        "site": "http://www.spamcannibal.org/cannibal.cgi"
-    },
-    {
-        "name": "dnsbl.abuse.ch",
-        "dns": "spam.abuse.ch",
-        "site": "http://dnsbl.abuse.ch/"
-    },
-    {
-        "name": "The Unsubscribe Blacklist(UBL)",
-        "dns": "ubl.unsubscore.com ",
-        "site": "http://www.lashback.com/blacklist/"
-    },
-    {
-        "name": "UCEPROTECT Network",
-        "dns": "dnsbl-1.uceprotect.net",
-        "site": "http://www.uceprotect.net/en"
-    }
-];
-
-function checkRblStatus(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(error, ip);
-
-        var flippedIp = ip.split('.').reverse().join('.');
-
-        // https://tools.ietf.org/html/rfc5782
-        async.map(RBL_LIST, function (rblServer, iteratorDone) {
-            dig.resolve(flippedIp + '.' + rblServer.dns, 'A', digOptions, function (error, records) {
-                if (error || !records) return iteratorDone(null, null);    // not listed
-
-                debug('checkRblStatus: %s (ip: %s) is in the blacklist of %j', config.fqdn(), flippedIp, rblServer);
-
-                var result = _.extend({ }, rblServer);
-
-                dig.resolve(flippedIp + '.' + rblServer.dns, 'TXT', digOptions, function (error, txtRecords) {
-                    result.txtRecords = error || !txtRecords ? 'No txt record' : txtRecords;
-
-                    debug('checkRblStatus: %s (error: %s) (txtRecords: %j)', config.fqdn(), error, txtRecords);
-
-                    return iteratorDone(null, result);
-                });
-            });
-        }, function (ignoredError, blacklistedServers) {
-            blacklistedServers = blacklistedServers.filter(function(b) { return b !== null; });
-
-            debug('checkRblStatus: %s (ip: %s) servers: %j', config.fqdn(), ip, blacklistedServers);
-
-            return callback(null, { status: blacklistedServers.length === 0, ip: ip, servers: blacklistedServers });
-        });
-    });
-}
-
-function getStatus(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    var results = {};
-
-    function recordResult(what, func) {
-        return function (callback) {
-            func(function (error, result) {
-                if (error) debug('Ignored error - ' + what + ':', error);
-
-                safe.set(results, what, result);
-
-                callback();
-            });
-        };
-    }
-
-    settings.getMailRelay(function (error, relay) {
-        if (error) return callback(error);
-
-        var checks = [
-            recordResult('dns.mx', checkMx),
-            recordResult('dns.dmarc', checkDmarc)
-        ];
-
-        if (relay.provider === 'cloudron-smtp') {
-            // these tests currently only make sense when using Cloudron's SMTP server at this point
-            checks.push(
-                recordResult('dns.spf', checkSpf),
-                recordResult('dns.dkim', checkDkim),
-                recordResult('dns.ptr', checkPtr),
-                recordResult('relay', checkOutboundPort25),
-                recordResult('rbl', checkRblStatus)
-            );
-        } else {
-            checks.push(recordResult('relay', checkSmtpRelay.bind(null, relay)));
-        }
-
-        async.parallel(checks, function () {
-            callback(null, results);
-        });
-    });
-}
@@ -77,7 +77,7 @@ function getByCreationTime(creationTime, callback) {
    assert(util.isDate(creationTime));
    assert.strictEqual(typeof callback, 'function');

-    var query = 'SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog WHERE creationTime >= ?';
+    var query = 'SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog WHERE creationTime >= ? ORDER BY creationTime DESC';
    database.query(query, [ creationTime ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

@@ -25,8 +25,7 @@ exports = module.exports = {
 var assert = require('assert'),
    constants = require('./constants.js'),
    database = require('./database.js'),
-    DatabaseError = require('./databaseerror'),
-    mailboxdb = require('./mailboxdb.js');
+    DatabaseError = require('./databaseerror');

 var GROUPS_FIELDS = [ 'id', 'name' ].join(',');

@@ -88,15 +87,9 @@ function add(id, name, callback) {
    assert.strictEqual(typeof name, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var data = [ id, name ];
-
-    var queries = [];
-    queries.push({ query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)', args: [ name, id, mailboxdb.TYPE_GROUP ] });
-    queries.push({ query: 'INSERT INTO groups (id, name) VALUES (?, ?)', args: [ id, name ] });
-
-    database.transaction(queries, function (error, result) {
+    database.query('INSERT INTO groups (id, name) VALUES (?, ?)', [ id, name ], function (error, result) {
        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
-        if (error || result[1].affectedRows !== 1) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (error || result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

        callback(null);
    });
@@ -110,7 +103,6 @@ function del(id, callback) {
    var queries = [];
    queries.push({ query: 'DELETE FROM groupMembers WHERE groupId = ?', args: [ id ] });
    queries.push({ query: 'DELETE FROM groups WHERE id = ?', args: [ id ] });
-    queries.push({ query: 'DELETE FROM mailboxes WHERE ownerId=?', args: [ id ] });

    database.transaction(queries, function (error, result) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
@@ -24,6 +24,7 @@ var assert = require('assert'),
    constants = require('./constants.js'),
    DatabaseError = require('./databaseerror.js'),
    groupdb = require('./groupdb.js'),
+    mailboxdb = require('./mailboxdb.js'),
    util = require('util'),
    uuid = require('uuid');

@@ -99,11 +100,15 @@ function remove(id, callback) {
    // never allow admin group to be deleted
    if (id === constants.ADMIN_GROUP_ID) return callback(new GroupError(GroupError.NOT_ALLOWED));

-    groupdb.del(id, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+    mailboxdb.delByOwnerId(id, function (error) {
        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));

-        callback(null);
+        groupdb.del(id, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+            if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
    });
 }

@@ -7,18 +7,18 @@
 exports = module.exports = {
    // a major version makes all apps restore from backup. #451 must be fixed before we do this.
    // a minor version makes all apps re-configure themselves
-    'version': '48.8.0',
+    'version': '48.9.0',

    'baseImages': [ 'cloudron/base:0.10.0' ],

    // Note that if any of the databases include an upgrade, bump the infra version above
    // This is because we upgrade using dumps instead of mysql_upgrade, pg_upgrade etc
    'images': {
-        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:0.18.0' },
-        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.0' },
-        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
-        'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.39.0' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.12.0' }
+        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:1.0.0' },
+        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:1.0.0' },
+        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:1.0.1' },
+        'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:1.0.0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.0.0' },
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:1.0.0' }
    }
 };
@@ -16,6 +16,8 @@ var assert = require('assert'),
    user = require('./user.js'),
    UserError = user.UserError,
    ldap = require('ldapjs'),
+    mail = require('./mail.js'),
+    MailError = mail.MailError,
    mailboxdb = require('./mailboxdb.js'),
    safe = require('safetydance');

@@ -152,7 +154,7 @@ function userSearch(req, res, next) {
                    cn: entry.id,
                    uid: entry.id,
                    mail: entry.email,
-                    mailAlternateAddress: entry.alternateEmail,
+                    mailAlternateAddress: entry.fallbackEmail,
                    displayname: displayName,
                    givenName: firstName,
                    username: entry.username,
@@ -258,14 +260,11 @@ function mailboxSearch(req, res, next) {

    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    var name = req.dn.rdns[0].attrs.cn.value.toLowerCase();
-    // allow login via email
-    var parts = name.split('@');
-    if (parts[1] === config.fqdn()) {
-        name = parts[0];
-    }
+    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var parts = email.split('@');
+    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    mailboxdb.getMailbox(name, function (error, mailbox) {
+    mailboxdb.getMailbox(parts[0], parts[1], function (error, mailbox) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
        if (error) return next(new ldap.OperationsError(error.toString()));

@@ -274,9 +273,9 @@ function mailboxSearch(req, res, next) {
            attributes: {
                objectclass: ['mailbox'],
                objectcategory: 'mailbox',
-                cn: mailbox.name,
-                uid: mailbox.name,
-                mail: mailbox.name + '@' + config.fqdn(),
+                cn: `${mailbox.name}@${mailbox.domain}`,
+                uid: `${mailbox.name}@${mailbox.domain}`,
+                mail: `${mailbox.name}@${mailbox.domain}`,
                ownerType: mailbox.ownerType
            }
        };
@@ -298,19 +297,24 @@ function mailAliasSearch(req, res, next) {

    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    mailboxdb.getAlias(req.dn.rdns[0].attrs.cn.value.toLowerCase(), function (error, alias) {
+    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var parts = email.split('@');
+    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+
+    mailboxdb.getAlias(parts[0], parts[1], function (error, alias) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
        if (error) return next(new ldap.OperationsError(error.toString()));

        // https://wiki.debian.org/LDAP/MigrationTools/Examples
        // https://docs.oracle.com/cd/E19455-01/806-5580/6jej518pp/index.html
+        // member is fully qualified - https://docs.oracle.com/cd/E19957-01/816-6082-10/chap4.doc.html#43314
        var obj = {
            dn: req.dn.toString(),
            attributes: {
                objectclass: ['nisMailAlias'],
                objectcategory: 'nisMailAlias',
-                cn: alias.name,
-                rfc822MailMember: alias.aliasTarget
+                cn: `${alias.name}@${alias.domain}`,
+                rfc822MailMember: `${alias.aliasTarget}@${alias.domain}`
            }
        };

@@ -331,19 +335,24 @@ function mailingListSearch(req, res, next) {

    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    mailboxdb.getGroup(req.dn.rdns[0].attrs.cn.value.toLowerCase(), function (error, group) {
+    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var parts = email.split('@');
+    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+
+    mailboxdb.getGroup(parts[0], parts[1], function (error, group) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
        if (error) return next(new ldap.OperationsError(error.toString()));

        // http://ldapwiki.willeke.com/wiki/Original%20Mailgroup%20Schema%20From%20Netscape
+        // members are fully qualified (https://docs.oracle.com/cd/E19444-01/816-6018-10/groups.htm#13356)
        var obj = {
            dn: req.dn.toString(),
            attributes: {
                objectclass: ['mailGroup'],
                objectcategory: 'mailGroup',
-                cn: group.name,
-                mail: group.name + '@' + config.fqdn(),
-                mgrpRFC822MailMember: group.members
+                cn: `${group.name}@${group.domain}`, // fully qualified
+                mail: `${group.name}@${group.domain}`,
+                mgrpRFC822MailMember: group.members.map(function (m) { return `${m}@${group.domain}`; })
            }
        };

@@ -411,41 +420,47 @@ function authorizeUserForApp(req, res, next) {
 function authenticateMailbox(req, res, next) {
    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    var name = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var parts = email.split('@');
+    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-    // allow login via email
-    var parts = name.split('@');
-    if (parts[1] === config.fqdn()) {
-        name = parts[0];
-    }
-
-    mailboxdb.getMailbox(name, function (error, mailbox) {
+    mailboxdb.getMailbox(parts[0], parts[1], function (error, mailbox) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
        if (error) return next(new ldap.OperationsError(error.message));

-        if (mailbox.ownerType === mailboxdb.TYPE_APP) {
-            var addonId = req.dn.rdns[1].attrs.ou.value.toLowerCase(); // 'sendmail' or 'recvmail'
-            var name;
-            if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
-            else if (addonId === 'recvmail') name = 'MAIL_IMAP_PASSWORD';
-            else return next(new ldap.OperationsError('Invalid DN'));
+        mail.get(parts[1], function (error, domain) {
+            if (error && error.reason === MailError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+            if (error) return next(new ldap.OperationsError(error.message));

-            appdb.getAddonConfigByName(mailbox.ownerId, addonId, name, function (error, value) {
-                if (error) return next(new ldap.OperationsError(error.message));
-                if (req.credentials !== value) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+            if (mailbox.ownerType === mailboxdb.TYPE_APP) {
+                var addonId = req.dn.rdns[1].attrs.ou.value.toLowerCase(); // 'sendmail' or 'recvmail'
+                var name;
+                if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
+                else if (addonId === 'recvmail') name = 'MAIL_IMAP_PASSWORD';
+                else return next(new ldap.OperationsError('Invalid DN'));

-                eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: name }, { appId: mailbox.ownerId, addonId: addonId });
-                return res.end();
-            });
-        } else if (mailbox.ownerType === mailboxdb.TYPE_USER) {
-            authenticateUser(req, res, function (error) {
-                if (error) return next(error);
-                eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: name }, { userId: req.user.username });
-                res.end();
-            });
-        } else {
-            return next(new ldap.OperationsError('Unknown ownerType for mailbox'));
-        }
+                appdb.getAddonConfigByName(mailbox.ownerId, addonId, name, function (error, value) {
+                    if (error) return next(new ldap.OperationsError(error.message));
+                    if (req.credentials !== value) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+
+                    eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: name }, { appId: mailbox.ownerId, addonId: addonId });
+                    return res.end();
+                });
+            } else if (mailbox.ownerType === mailboxdb.TYPE_USER) {
+                if (!domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+
+                user.verifyWithUsername(parts[0], req.credentials || '', function (error, user) {
+                    if (error && error.reason === UserError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+                    if (error && error.reason === UserError.WRONG_PASSWORD) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+                    if (error) return next(new ldap.OperationsError(error.message));
+
+                    eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: user.username });
+                    res.end();
+                });
+            } else {
+                return next(new ldap.OperationsError('Unknown ownerType for mailbox'));
+            }
+        });
    });
 }

@@ -479,13 +494,13 @@ function start(callback) {
    gServer.compare('cn=admins,ou=groups,dc=cloudron', groupAdminsCompare);

    // this is the bind for addons (after bind, they might search and authenticate)
-    gServer.bind('ou=addons,dc=cloudron', function(req, res, next) {
+    gServer.bind('ou=addons,dc=cloudron', function(req, res /*, next */) {
        debug('addons bind: %s', req.dn.toString()); // note: cn can be email or id
        res.end();
    });

    // this is the bind for apps (after bind, they might search and authenticate user)
-    gServer.bind('ou=apps,dc=cloudron', function(req, res, next) {
+    gServer.bind('ou=apps,dc=cloudron', function(req, res /*, next */) {
        // TODO: validate password
        debug('application bind: %s', req.dn.toString());
        res.end();
@@ -15,6 +15,7 @@ util.inherits(Locker, EventEmitter);

 // these are mutually exclusive operations
 Locker.prototype.OP_BOX_UPDATE = 'box_update';
+Locker.prototype.OP_PLATFORM_START = 'platform_start';
 Locker.prototype.OP_FULL_BACKUP = 'full_backup';
 Locker.prototype.OP_APPTASK = 'apptask';
 Locker.prototype.OP_MIGRATE = 'migrate';
@@ -0,0 +1,999 @@
+'use strict';
+
+exports = module.exports = {
+    getStatus: getStatus,
+
+    get: get,
+    getAll: getAll,
+
+    add: add,
+    del: del,
+
+    setMailFromValidation: setMailFromValidation,
+    setCatchAllAddress: setCatchAllAddress,
+    setMailRelay: setMailRelay,
+    setMailEnabled: setMailEnabled,
+
+    startMail: restartMail,
+
+    sendTestMail: sendTestMail,
+
+    getMailboxes: getMailboxes,
+    getUserMailbox: getUserMailbox,
+    enableUserMailbox: enableUserMailbox,
+    disableUserMailbox: disableUserMailbox,
+
+    getAliases: getAliases,
+    setAliases: setAliases,
+
+    getLists: getLists,
+    getList: getList,
+    addList: addList,
+    removeList: removeList,
+
+    _readDkimPublicKeySync: readDkimPublicKeySync,
+
+    MailError: MailError
+};
+
+var assert = require('assert'),
+    async = require('async'),
+    config = require('./config.js'),
+    constants = require('./constants.js'),
+    DatabaseError = require('./databaseerror.js'),
+    debug = require('debug')('box:mail'),
+    dig = require('./dig.js'),
+    domains = require('./domains.js'),
+    groups = require('./groups.js'),
+    GroupError = groups.GroupError,
+    infra = require('./infra_version.js'),
+    mailboxdb = require('./mailboxdb.js'),
+    maildb = require('./maildb.js'),
+    mailer = require('./mailer.js'),
+    net = require('net'),
+    nodemailer = require('nodemailer'),
+    os = require('os'),
+    path = require('path'),
+    paths = require('./paths.js'),
+    reverseProxy = require('./reverseproxy.js'),
+    safe = require('safetydance'),
+    shell = require('./shell.js'),
+    smtpTransport = require('nodemailer-smtp-transport'),
+    sysinfo = require('./sysinfo.js'),
+    user = require('./user.js'),
+    UserError = user.UserError,
+    util = require('util'),
+    _ = require('underscore');
+
+const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function MailError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(MailError, Error);
+MailError.INTERNAL_ERROR = 'Internal Error';
+MailError.BAD_FIELD = 'Bad Field';
+MailError.ALREADY_EXISTS = 'Already Exists';
+MailError.NOT_FOUND = 'Not Found';
+
+function validateAlias(alias) {
+    assert.strictEqual(typeof alias, 'string');
+
+    if (alias.length < 1) return new MailError(MailError.BAD_FIELD, 'alias must be atleast 1 char');
+    if (alias.length >= 200) return new MailError(MailError.BAD_FIELD, 'alias too long');
+
+    if (constants.RESERVED_NAMES.indexOf(alias) !== -1) return new MailError(MailError.BAD_FIELD, 'alias is reserved');
+
+    // +/- can be tricky in emails. also need to consider valid LDAP characters here (e.g '+' is reserved)
+    if (/[^a-zA-Z0-9.]/.test(alias)) return new MailError(MailError.BAD_FIELD, 'alias can only contain alphanumerals and dot');
+
+    // app emails are sent using the .app suffix
+    if (alias.indexOf('.app') !== -1) return new MailError(MailError.BAD_FIELD, 'alias pattern is reserved for apps');
+
+    return null;
+}
+
+function checkOutboundPort25(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    var smtpServer = _.sample([
+        'smtp.gmail.com',
+        'smtp.live.com',
+        'smtp.mail.yahoo.com',
+        'smtp.o2.ie',
+        'smtp.comcast.net',
+        'outgoing.verizon.net'
+    ]);
+
+    var relay = {
+        value: 'OK',
+        status: false
+    };
+
+    var client = new net.Socket();
+    client.setTimeout(5000);
+    client.connect(25, smtpServer);
+    client.on('connect', function () {
+        relay.status = true;
+        relay.value = 'OK';
+        client.destroy(); // do not use end() because it still triggers timeout
+        callback(null, relay);
+    });
+    client.on('timeout', function () {
+        relay.status = false;
+        relay.value = 'Connect to ' + smtpServer + ' timed out';
+        client.destroy();
+        callback(new Error('Timeout'), relay);
+    });
+    client.on('error', function (error) {
+        relay.status = false;
+        relay.value = 'Connect to ' + smtpServer + ' failed: ' + error.message;
+        client.destroy();
+        callback(error, relay);
+    });
+}
+
+function checkSmtpRelay(relay, callback) {
+    var result = {
+        value: 'OK',
+        status: false
+    };
+
+    var transporter = nodemailer.createTransport(smtpTransport({
+        host: relay.host,
+        port: relay.port,
+        auth: {
+            user: relay.username,
+            pass: relay.password
+        }
+    }));
+
+    transporter.verify(function(error) {
+        result.status = !error;
+        if (error) {
+            result.value = error.message;
+            return callback(error, result);
+        }
+
+        callback(null, result);
+    });
+}
+
+function verifyRelay(relay, callback) {
+    assert.strictEqual(typeof relay, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var verifier = relay.provider === 'cloudron-smtp' ? checkOutboundPort25 : checkSmtpRelay.bind(null, relay);
+
+    verifier(function (error) {
+        if (error) return callback(new MailError(MailError.BAD_FIELD, error.message));
+
+        callback();
+    });
+}
+
+function checkDkim(domain, callback) {
+    var dkim = {
+        domain: config.dkimSelector() + '._domainkey.' + domain,
+        type: 'TXT',
+        expected: null,
+        value: null,
+        status: false
+    };
+
+    var dkimKey = readDkimPublicKeySync(domain);
+    if (!dkimKey) return callback(new Error('Failed to read dkim public key'), dkim);
+
+    dkim.expected = '"v=DKIM1; t=s; p=' + dkimKey + '"';
+
+    dig.resolve(dkim.domain, dkim.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, dkim);    // not setup
+        if (error) return callback(error, dkim);
+
+        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
+            dkim.value = txtRecords[0];
+            dkim.status = (dkim.value === dkim.expected);
+        }
+
+        callback(null, dkim);
+    });
+}
+
+function checkSpf(domain, callback) {
+    var spf = {
+        domain: domain,
+        type: 'TXT',
+        value: null,
+        expected: '"v=spf1 a:' + config.mailFqdn() + ' ~all"',
+        status: false
+    };
+
+    // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
+    dig.resolve(spf.domain, spf.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, spf);    // not setup
+        if (error) return callback(error, spf);
+
+        if (!Array.isArray(txtRecords)) return callback(null, spf);
+
+        var i;
+        for (i = 0; i < txtRecords.length; i++) {
+            if (txtRecords[i].indexOf('"v=spf1 ') !== 0) continue; // not SPF
+            spf.value = txtRecords[i];
+            spf.status = spf.value.indexOf(' a:' + config.adminFqdn()) !== -1;
+            break;
+        }
+
+        if (spf.status) {
+            spf.expected = spf.value;
+        } else if (i !== txtRecords.length) {
+            spf.expected = '"v=spf1 a:' + config.adminFqdn() + ' ' + spf.value.slice('"v=spf1 '.length);
+        }
+
+        callback(null, spf);
+    });
+}
+
+function checkMx(domain, callback) {
+    var mx = {
+        domain: domain,
+        type: 'MX',
+        value: null,
+        expected: '10 ' + config.mailFqdn() + '.',
+        status: false
+    };
+
+    dig.resolve(mx.domain, mx.type, digOptions, function (error, mxRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, mx);    // not setup
+        if (error) return callback(error, mx);
+
+        if (Array.isArray(mxRecords) && mxRecords.length !== 0) {
+            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === (config.mailFqdn() + '.');
+            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange; }).join(' ');
+        }
+
+        callback(null, mx);
+    });
+}
+
+function checkDmarc(domain, callback) {
+    var dmarc = {
+        domain: '_dmarc.' + domain,
+        type: 'TXT',
+        value: null,
+        expected: '"v=DMARC1; p=reject; pct=100"',
+        status: false
+    };
+
+    dig.resolve(dmarc.domain, dmarc.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, dmarc);    // not setup
+        if (error) return callback(error, dmarc);
+
+        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
+            dmarc.value = txtRecords[0];
+            dmarc.status = (dmarc.value === dmarc.expected);
+        }
+
+        callback(null, dmarc);
+    });
+}
+
+function checkPtr(callback) {
+    var ptr = {
+        domain: null,
+        type: 'PTR',
+        value: null,
+        expected: config.mailFqdn() + '.',
+        status: false
+    };
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error, ptr);
+
+        ptr.domain = ip.split('.').reverse().join('.') + '.in-addr.arpa';
+
+        dig.resolve(ip, 'PTR', digOptions, function (error, ptrRecords) {
+            if (error && error.code === 'ENOTFOUND') return callback(null, ptr);    // not setup
+            if (error) return callback(error, ptr);
+
+            if (Array.isArray(ptrRecords) && ptrRecords.length !== 0) {
+                ptr.value = ptrRecords.join(' ');
+                ptr.status = ptrRecords.some(function (v) { return v === ptr.expected; });
+            }
+
+            return callback(null, ptr);
+        });
+    });
+}
+
+// https://raw.githubusercontent.com/jawsome/node-dnsbl/master/list.json
+const RBL_LIST = [
+    {
+        'name': 'Barracuda',
+        'dns': 'b.barracudacentral.org',
+        'site': 'http://www.barracudacentral.org/rbl/removal-request'
+    },
+    {
+        'name': 'SpamCop',
+        'dns': 'bl.spamcop.net',
+        'site': 'http://spamcop.net'
+    },
+    {
+        'name': 'Sorbs Aggregate Zone',
+        'dns': 'dnsbl.sorbs.net',
+        'site': 'http://dnsbl.sorbs.net/'
+    },
+    {
+        'name': 'Sorbs spam.dnsbl Zone',
+        'dns': 'spam.dnsbl.sorbs.net',
+        'site': 'http://sorbs.net'
+    },
+    {
+        'name': 'Composite Blocking List',
+        'dns': 'cbl.abuseat.org',
+        'site': 'http://www.abuseat.org'
+    },
+    {
+        'name': 'SpamHaus Zen',
+        'dns': 'zen.spamhaus.org',
+        'site': 'http://spamhaus.org'
+    },
+    {
+        'name': 'Multi SURBL',
+        'dns': 'multi.surbl.org',
+        'site': 'http://www.surbl.org'
+    },
+    {
+        'name': 'Spam Cannibal',
+        'dns': 'bl.spamcannibal.org',
+        'site': 'http://www.spamcannibal.org/cannibal.cgi'
+    },
+    {
+        'name': 'dnsbl.abuse.ch',
+        'dns': 'spam.abuse.ch',
+        'site': 'http://dnsbl.abuse.ch/'
+    },
+    {
+        'name': 'The Unsubscribe Blacklist(UBL)',
+        'dns': 'ubl.unsubscore.com ',
+        'site': 'http://www.lashback.com/blacklist/'
+    },
+    {
+        'name': 'UCEPROTECT Network',
+        'dns': 'dnsbl-1.uceprotect.net',
+        'site': 'http://www.uceprotect.net/en'
+    }
+];
+
+// this function currently only looks for black lists based on IP. TODO: also look up by domain
+function checkRblStatus(domain, callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error, ip);
+
+        var flippedIp = ip.split('.').reverse().join('.');
+
+        // https://tools.ietf.org/html/rfc5782
+        async.map(RBL_LIST, function (rblServer, iteratorDone) {
+            dig.resolve(flippedIp + '.' + rblServer.dns, 'A', digOptions, function (error, records) {
+                if (error || !records) return iteratorDone(null, null);    // not listed
+
+                debug('checkRblStatus: %s (ip: %s) is in the blacklist of %j', domain, flippedIp, rblServer);
+
+                var result = _.extend({ }, rblServer);
+
+                dig.resolve(flippedIp + '.' + rblServer.dns, 'TXT', digOptions, function (error, txtRecords) {
+                    result.txtRecords = error || !txtRecords ? 'No txt record' : txtRecords;
+
+                    debug('checkRblStatus: %s (error: %s) (txtRecords: %j)', domain, error, txtRecords);
+
+                    return iteratorDone(null, result);
+                });
+            });
+        }, function (ignoredError, blacklistedServers) {
+            blacklistedServers = blacklistedServers.filter(function(b) { return b !== null; });
+
+            debug('checkRblStatus: %s (ip: %s) servers: %j', domain, ip, blacklistedServers);
+
+            return callback(null, { status: blacklistedServers.length === 0, ip: ip, servers: blacklistedServers });
+        });
+    });
+}
+
+function getStatus(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    // ensure we always have a valid toplevel properties for the api
+    var results = {
+        dns: {},
+        rbl: {},
+        relay: {}
+    };
+
+    function recordResult(what, func) {
+        return function (callback) {
+            func(function (error, result) {
+                if (error) debug('Ignored error - ' + what + ':', error);
+
+                safe.set(results, what, result);
+
+                callback();
+            });
+        };
+    }
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        var checks = [
+            recordResult('dns.mx', checkMx.bind(null, domain)),
+            recordResult('dns.dmarc', checkDmarc.bind(null, domain))
+        ];
+
+        if (result.relay.provider === 'cloudron-smtp') {
+            // these tests currently only make sense when using Cloudron's SMTP server at this point
+            checks.push(
+                recordResult('dns.spf', checkSpf.bind(null, domain)),
+                recordResult('dns.dkim', checkDkim.bind(null, domain)),
+                recordResult('dns.ptr', checkPtr),
+                recordResult('relay', checkOutboundPort25),
+                recordResult('rbl', checkRblStatus.bind(null, domain))
+            );
+        } else {
+            checks.push(recordResult('relay', checkSmtpRelay.bind(null, result.relay)));
+        }
+
+        async.parallel(checks, function () {
+            callback(null, results);
+        });
+    });
+}
+
+function createMailConfig(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    const mailFqdn = config.mailFqdn();
+
+    debug('createMailConfig: generating mail config');
+
+    maildb.getAll(function (error, mailOutDomains) {
+        if (error) return callback(error);
+
+        var mailDomain = mailOutDomains[0]; // mail container can only handle one domain at this point
+
+        const alertsFrom = `no-reply@${mailDomain.domain}`;
+
+        user.getOwner(function (error, owner) {
+            const alertsTo = config.provider() === 'caas' ? [ 'support@cloudron.io' ] : [ ];
+            alertsTo.concat(error ? [] : owner.email).join(','); // owner may not exist yet
+
+            const mailOutDomain = mailDomain.domain;
+            const mailInDomain = mailDomain.enabled ? mailDomain.domain : '';
+            const catchAll = mailDomain.catchAll.map(function (c) { return `${c}@${mailDomain.domain}`; }).join(',');
+            const mailFromValidation = mailDomain.mailFromValidation;
+
+            if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/mail.ini',
+                `mail_in_domains=${mailInDomain}\nmail_out_domains=${mailOutDomain}\nmail_default_domain=${mailDomain.domain}\nmail_server_name=${mailFqdn}\nalerts_from=${alertsFrom}\nalerts_to=${alertsTo}\ncatch_all=${catchAll}\nmail_from_validation=${mailFromValidation}\n`, 'utf8')) {
+                return callback(new Error('Could not create mail var file:' + safe.error.message));
+            }
+
+            var relay = mailDomain.relay;
+
+            const enabled = relay.provider !== 'cloudron-smtp' ? true : false,
+                host = relay.host || '',
+                port = relay.port || 25,
+                username = relay.username || '',
+                password = relay.password || '';
+
+            if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
+                `enable_outbound=${enabled}\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}`, 'utf8')) {
+                return callback(new Error('Could not create mail var file:' + safe.error.message));
+            }
+
+            callback(null, mailInDomain.length !== 0);
+        });
+    });
+}
+
+function restartMail(callback) {
+    // mail (note: 2525 is hardcoded in mail container and app use this port)
+    // MAIL_SERVER_NAME is the hostname of the mailserver i.e server uses these certs
+    // MAIL_DOMAIN is the domain for which this server is relaying mails
+    // mail container uses /app/data for backed up data and /run for restart-able data
+
+    if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return callback();
+
+    const tag = infra.images.mail.tag;
+    const memoryLimit = Math.max((1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 128, 256);
+
+    // admin and mail share the same certificate
+    reverseProxy.getCertificate({ intrinsicFqdn: config.adminFqdn(), domain: config.adminDomain() }, function (error, bundle) {
+        if (error) return callback(error);
+
+        // the setup script copies dhparams.pem to /addons/mail
+        const mailCertFilePath = path.join(paths.ADDON_CONFIG_DIR, 'mail/tls_cert.pem');
+        const mailKeyFilePath = path.join(paths.ADDON_CONFIG_DIR, 'mail/tls_key.pem');
+
+        if (!safe.child_process.execSync(`cp ${bundle.certFilePath} ${mailCertFilePath}`)) return callback(new Error('Could not create cert file:' + safe.error.message));
+        if (!safe.child_process.execSync(`cp ${bundle.keyFilePath} ${mailKeyFilePath}`)) return callback(new Error('Could not create key file:' + safe.error.message));
+
+        shell.execSync('startMail', 'docker rm -f mail || true');
+
+        createMailConfig(function (error, allowInbound) {
+            if (error) return callback(error);
+
+            var ports = allowInbound ? '-p 587:2525 -p 993:9993 -p 4190:4190 -p 25:2525' : '';
+
+            const cmd = `docker run --restart=always -d --name="mail" \
+                        --net cloudron \
+                        --net-alias mail \
+                        -m ${memoryLimit}m \
+                        --memory-swap ${memoryLimit * 2}m \
+                        --dns 172.18.0.1 \
+                        --dns-search=. \
+                        -v "${paths.MAIL_DATA_DIR}:/app/data" \
+                        -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
+                        ${ports} \
+                        --read-only -v /run -v /tmp ${tag}`;
+
+            shell.execSync('startMail', cmd);
+
+            callback();
+        });
+    });
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.get(domain, function (error, result) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        return callback(null, result);
+    });
+}
+
+function getAll(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.getAll(function (error, results) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        return callback(null, results);
+    });
+}
+
+function ensureDkimKey(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
+    var dkimPrivateKeyFile = path.join(dkimPath, 'private');
+    var dkimPublicKeyFile = path.join(dkimPath, 'public');
+    var dkimSelectorFile = path.join(dkimPath, 'selector');
+
+    debug('Generating new DKIM keys');
+
+    if (!safe.fs.mkdirSync(dkimPath) && safe.error.code !== 'EEXIST') {
+        debug('Error creating dkim.', safe.error);
+        return new MailError(MailError.INTERNAL_ERROR, safe.error);
+    }
+
+    if (!safe.child_process.execSync('openssl genrsa -out ' + dkimPrivateKeyFile + ' 1024')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+    if (!safe.child_process.execSync('openssl rsa -in ' + dkimPrivateKeyFile + ' -out ' + dkimPublicKeyFile + ' -pubout -outform PEM')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+
+    if (!safe.fs.writeFileSync(dkimSelectorFile, config.dkimSelector(), 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+
+    callback();
+}
+
+// https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
+function txtRecordsWithSpf(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    domains.getDNSRecords('', config.adminDomain(), 'TXT', function (error, txtRecords) {
+        if (error) return callback(error);
+
+        debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
+
+        var i, matches, validSpf;
+
+        for (i = 0; i < txtRecords.length; i++) {
+            matches = txtRecords[i].match(/^("?v=spf1) /); // DO backend may return without quotes
+            if (matches === null) continue;
+
+            // this won't work if the entry is arbitrarily "split" across quoted strings
+            validSpf = txtRecords[i].indexOf('a:' + config.adminFqdn()) !== -1;
+            break; // there can only be one SPF record
+        }
+
+        if (validSpf) return callback(null, null);
+
+        if (!matches) { // no spf record was found, create one
+            txtRecords.push('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
+            debug('txtRecordsWithSpf: adding txt record');
+        } else { // just add ourself
+            txtRecords[i] = matches[1] + ' a:' + config.adminFqdn() + txtRecords[i].slice(matches[1].length);
+            debug('txtRecordsWithSpf: inserting txt record');
+        }
+
+        return callback(null, txtRecords);
+    });
+}
+
+function readDkimPublicKeySync(domain) {
+    assert.strictEqual(typeof domain, 'string');
+
+    var dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
+    var dkimPublicKeyFile = path.join(dkimPath, 'public');
+
+    var publicKey = safe.fs.readFileSync(dkimPublicKeyFile, 'utf8');
+
+    if (publicKey === null) {
+        debug('Error reading dkim public key.', safe.error);
+        return null;
+    }
+
+    // remove header, footer and new lines
+    publicKey = publicKey.split('\n').slice(1, -2).join('');
+
+    return publicKey;
+}
+
+function addDnsRecords(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (process.env.BOX_ENV === 'test') return callback();
+
+    var dkimKey = readDkimPublicKeySync(domain);
+    if (!dkimKey) return callback(new MailError(MailError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
+
+    // t=s limits the domainkey to this domain and not it's subdomains
+    var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
+
+    var records = [ ];
+    records.push(dkimRecord);
+
+    debug('addDnsRecords: %j', records);
+
+    async.retry({ times: 10, interval: 20000 }, function (retryCallback) {
+        txtRecordsWithSpf(function (error, txtRecords) {
+            if (error) return retryCallback(error);
+
+            if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });
+
+            debug('addDnsRecords: will update %j', records);
+
+            async.mapSeries(records, function (record, iteratorCallback) {
+                domains.upsertDNSRecords(record.subdomain, record.domain, record.type, record.values, iteratorCallback);
+            }, function (error, changeIds) {
+                if (error) debug('addDnsRecords: failed to update : %s. will retry', error);
+                else debug('addDnsRecords: records %j added with changeIds %j', records, changeIds);
+
+                retryCallback(error);
+            });
+        });
+    }, function (error) {
+        if (error) debug('addDnsRecords: done updating records with error:', error);
+        else debug('addDnsRecords: done');
+
+        callback(error);
+    });
+}
+
+function add(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    ensureDkimKey(domain, function (error) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        maildb.add(domain, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'Domain already exists'));
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            addDnsRecords(domain, NOOP_CALLBACK); // add the required dns records asynchronously
+
+            callback();
+        });
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.del(domain, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, error.message));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        callback();
+    });
+}
+
+function setMailFromValidation(domain, enabled, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof enabled, 'boolean');
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.update(domain, { mailFromValidation: enabled }, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        createMailConfig(NOOP_CALLBACK);
+
+        callback(null);
+    });
+}
+
+function setCatchAllAddress(domain, address, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert(Array.isArray(address));
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.update(domain, { catchAll: address }, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        createMailConfig(NOOP_CALLBACK);
+
+        callback(null);
+    });
+}
+
+function setMailRelay(domain, relay, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof relay, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    verifyRelay(relay, function (error) {
+        if (error) return callback(error);
+
+        maildb.update(domain, { relay: relay }, function (error) {
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            restartMail(NOOP_CALLBACK);
+
+            callback(null);
+        });
+    });
+}
+
+function setMailEnabled(domain, enabled, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof enabled, 'boolean');
+    assert.strictEqual(typeof callback, 'function');
+
+    maildb.update(domain, { enabled: enabled }, function (error) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        restartMail(NOOP_CALLBACK);
+
+        if (!enabled || process.env.BOX_ENV === 'test') return callback(null);
+
+        // Add MX and DMARC record. Note that DMARC policy depends on DKIM signing and thus works
+        // only if we use our internal mail server.
+        var records = [
+            { subdomain: '_dmarc', type: 'TXT', values: [ '"v=DMARC1; p=reject; pct=100"' ] },
+            { subdomain: '', type: 'MX', values: [ '10 ' + config.mailFqdn() + '.' ] }
+        ];
+
+        async.mapSeries(records, function (record, iteratorCallback) {
+            domains.upsertDNSRecords(record.subdomain, domain, record.type, record.values, iteratorCallback);
+        }, NOOP_CALLBACK);
+
+        callback(null);
+    });
+}
+
+function sendTestMail(domain, to, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof to, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        mailer.sendTestMail(result.domain, to);
+
+        callback();
+    });
+}
+
+function getMailboxes(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    mailboxdb.listMailboxes(domain, function (error, result) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        callback(null, result);
+    });
+}
+
+function getUserMailbox(domain, userId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.getMailbox(result.username, domain, function (error, result) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null, result);
+        });
+    });
+}
+
+function enableUserMailbox(domain, userId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR));
+
+        mailboxdb.add(result.username, domain, userId, mailboxdb.TYPE_USER, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'mailbox already exists'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
+    });
+}
+
+function disableUserMailbox(domain, userId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.del(result.username, domain, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
+    });
+}
+
+function getAliases(domain, userId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        if (!result.username) return callback(null, []);
+
+        mailboxdb.getAliasesForName(result.username, domain, function (error, aliases) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null, aliases);
+        });
+    });
+}
+
+function setAliases(domain, userId, aliases, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
+    assert(Array.isArray(aliases));
+    assert.strictEqual(typeof callback, 'function');
+
+    for (var i = 0; i < aliases.length; i++) {
+        aliases[i] = aliases[i].toLowerCase();
+
+        var error = validateAlias(aliases[i]);
+        if (error) return callback(error);
+    }
+
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.setAliasesForName(result.username, domain, aliases, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, error.message));
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
+    });
+}
+
+function getLists(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    mailboxdb.listGroups(domain, function (error, result) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        callback(null, result);
+    });
+}
+
+function getList(domain, groupId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof groupId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.getGroup(result.name, domain, function (error, result) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null, result);
+        });
+    });
+}
+
+function addList(domain, groupId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof groupId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.add(result.name, domain, groupId, mailboxdb.TYPE_GROUP, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'list already exits'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback();
+        });
+    });
+}
+
+function removeList(domain, groupId, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof groupId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        mailboxdb.del(result.name, domain, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback();
+        });
+    });
+}
@@ -1,8 +1,8 @@
 <%if (format === 'text') { %>

-Dear Cloudron Admin,
+Dear <%= cloudronName %> Admin,

-creating a backup of <%= fqdn %> has failed.
+creating a backup has failed.

 -------------------------------------

@@ -2,7 +2,7 @@

 Dear <%= cloudronName %> Admin,

-Version <%= newBoxVersion %> for Cloudron <%= fqdn %> is now available!
+Version <%= newBoxVersion %> is now available!

 Changelog:
 <% for (var i = 0; i < changelog.length; i++) { %>
@@ -27,7 +27,7 @@ Sent at: <%= new Date().toUTCString() %>

 <div style="width: 650px; text-align: left;">
    <p>
-        Version <b><%= newBoxVersion %></b> for Cloudron <%= fqdn %> is now available!
+        Version <b><%= newBoxVersion %></b> is now available!
    </p>

    <h5>Changelog:</h5>
@@ -2,7 +2,7 @@

 Dear <%= cloudronName %> Admin,

-This is a summary of the activities on your Cloudron <%= fqdn %>.
+This is a summary of the activities on your Cloudron.
 <% if (info.usersAdded.length) { -%>

 The following users were added:
@@ -1,14 +0,0 @@
-<%if (format === 'text') { %>
-
-New <%= type %> from <%= fqdn %>.
-
-Sender:  <%= user.email %>
-Sent at: <%= new Date().toUTCString() %>
-
-Subject: <%= subject %>
-----------------------------------------------------------
-<%= description %>
-
-<% } else { %>
-
-<% } %>
@@ -1,8 +1,8 @@
 <%if (format === 'text') { %>

-Dear Cloudron Admin,
+Dear <%= cloudronName %> Admin,

-<%= program %> on <%= fqdn %> exited unexpectedly using too much memory!
+<%= program %>  exited unexpectedly using too much memory!

 The app has been restarted now. Should this message appear repeatedly or
 undefined behavior is observed, give the app more memory.
@@ -1,8 +1,8 @@
 <%if (format === 'text') { %>

-Dear Cloudron Admin,
+Dear <%= cloudronName %> Admin,

-<%= fqdn %> is running out of disk space.
+your server is running out of disk space.

 Disk space logs are attached.

@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>

-Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,
+Hi <%= user.displayName || user.username || user.email %>,

 Someone, hopefully you, has requested your account's password
 be reset. If you did not request this reset, please ignore this message.
@@ -18,7 +18,7 @@ Powered by https://cloudron.io

 <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>

-<h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
+<h3>Hi <%= user.displayName || user.username || user.email %>,</h3>

 <p>
    Someone, hopefully you, has requested your account's password be reset.<br/>
@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>

-Test email from <%= fqdn %>,
+Test email from <%= cloudronName %>,

 If you can read this, your Cloudron email settings are good.

@@ -1,7 +1,6 @@
 {
    "format": "html",
    "webadminUrl": "https://my.cloudron.io",
-    "fqdn": "my.cloudron.io",
    "cloudronName": "Smartserver",
    "cloudronAvatarUrl": "https://cloudron.io/img/logo.png",
    "info": {
@@ -1,8 +1,8 @@
 <%if (format === 'text') { %>

-Dear Cloudron Admin,
+Dear <%= cloudronName %> Admin,

-Unfortunately <%= program %> on <%= fqdn %> exited unexpectedly!
+Unfortunately <%= program %> exited unexpectedly!

 Please see some excerpt of the logs below:

@@ -2,7 +2,7 @@

 Dear <%= cloudronName %> Admin,

-A new user with email <%= user.alternateEmail || user.email %> was added to <%= cloudronName %>.
+A new user with email <%= user.email %> was added to <%= cloudronName %>.

 <% if (inviteLink) { %>
 As requested, this user has not been sent an invitation email.
@@ -24,7 +24,7 @@ Powered by https://cloudron.io
 <h3>Dear <%= cloudronName %> Admin,</h3>

 <p>
-    A new user with email <%= user.alternateEmail || user.email %> was added to <%= cloudronName %>.
+    A new user with email <%= user.email %> was added to <%= cloudronName %>.
 </p>

 <% if (inviteLink) { %>
@@ -2,7 +2,7 @@

 Dear Cloudron Admin,

-User <%= user.username || user.alternateEmail || user.email %> <%= event %>.
+User <%= user.username || user.email %> <%= event %>.


 Powered by https://cloudron.io
@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>

-Dear <%= user.displayName || user.username || user.alternateEmail || user.email %>,
+Dear <%= user.displayName || user.username || user.email %>,

 Welcome to <%= cloudronName %>!

@@ -20,7 +20,7 @@ Powered by https://cloudron.io

 <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>

-<h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
+<h3>Hi <%= user.displayName || user.username || user.email %>,</h3>

 <h2>Welcome to <%= cloudronName %>!</h2>

@@ -6,6 +6,7 @@ exports = module.exports = {

    listAliases: listAliases,
    listMailboxes: listMailboxes,
+    listGroups: listGroups,

    getMailbox: getMailbox,
    getGroup: getGroup,
@@ -31,15 +32,16 @@ var assert = require('assert'),
    DatabaseError = require('./databaseerror.js'),
    util = require('util');

-var MAILBOX_FIELDS = [ 'name', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime' ].join(',');
+var MAILBOX_FIELDS = [ 'name', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime', 'domain' ].join(',');

-function add(name, ownerId, ownerType, callback) {
+function add(name, domain, ownerId, ownerType, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof ownerId, 'string');
    assert.strictEqual(typeof ownerType, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)', [ name, ownerId, ownerType ], function (error) {
+    database.query('INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)', [ name, domain, ownerId, ownerType ], function (error) {
        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mailbox already exists'));
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

@@ -56,12 +58,13 @@ function clear(callback) {
    });
 }

-function del(name, callback) {
+function del(name, domain, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

    // deletes aliases as well
-    database.query('DELETE FROM mailboxes WHERE name=? OR aliasTarget = ?', [ name, name ], function (error, result) {
+    database.query('DELETE FROM mailboxes WHERE (name=? OR aliasTarget = ?) AND domain = ?', [ name, name, domain ], function (error, result) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

@@ -81,15 +84,17 @@ function delByOwnerId(id, callback) {
    });
 }

-function updateName(oldName, newName, callback) {
+function updateName(oldName, oldDomain, newName, newDomain, callback) {
    assert.strictEqual(typeof oldName, 'string');
+    assert.strictEqual(typeof oldDomain, 'string');
    assert.strictEqual(typeof newName, 'string');
+    assert.strictEqual(typeof newDomain, 'string');
    assert.strictEqual(typeof callback, 'function');

    // skip if no changes
-    if (oldName === newName) return callback(null);
+    if (oldName === newName && oldDomain === newDomain) return callback(null);

-    database.query('UPDATE mailboxes SET name=? WHERE name=?', [ newName, oldName ], function (error, result) {
+    database.query('UPDATE mailboxes SET name=?, domain=? WHERE name=? AND domain = ?', [ newName, newDomain, oldName, oldDomain ], function (error, result) {
        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mailbox already exists'));
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
@@ -98,11 +103,12 @@ function updateName(oldName, newName, callback) {
    });
 }

-function getMailbox(name, callback) {
+function getMailbox(name, domain, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL', [ name, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL', [ name, domain, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

@@ -110,18 +116,32 @@ function getMailbox(name, callback) {
    });
 }

-function listMailboxes(callback) {
+function listMailboxes(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL ORDER BY name', [ exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL ORDER BY name', [ domain, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

        callback(null, results);
    });
 }

-function getGroup(name, callback) {
+function listGroups(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND ownerType = ? AND aliasTarget IS NULL', [ domain, exports.TYPE_GROUP ], function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null, results);
+    });
+}
+
+function getGroup(name, domain, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

    // This can be merged into a single query but cannot get 'not found' information
@@ -130,11 +150,12 @@ function getGroup(name, callback) {
    //    INNER JOIN users ON groupMembers.userId = users.id
    //    WHERE mailboxes.name = <name>

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND ownerType = ? AND aliasTarget IS NULL', [ name, exports.TYPE_GROUP ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND ownerType = ? AND aliasTarget IS NULL', [ name, domain, exports.TYPE_GROUP ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

-        database.query('SELECT users.username FROM groupMembers INNER JOIN users ON groupMembers.userId = users.id WHERE groupMembers.groupId = ?', [ results[0].ownerId ], function (error, memberList) {
+        // username can be null if the user has not signed up with the invite yet
+        database.query('SELECT users.username FROM groupMembers INNER JOIN users ON groupMembers.userId = users.id WHERE groupMembers.groupId = ? AND users.username IS NOT NULL', [ results[0].ownerId ], function (error, memberList) {
            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

            results[0].members = memberList.map(function (m) { return m.username; });
@@ -156,20 +177,21 @@ function getByOwnerId(ownerId, callback) {
    });
 }

-function setAliasesForName(name, aliases, callback) {
+function setAliasesForName(name, domain, aliases, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert(util.isArray(aliases));
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? ', [ name ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ?', [ name, domain ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

        var queries = [];
-        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ?', args: [ name ] });
+        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ? AND domain = ?', args: [ name, domain ] });
        aliases.forEach(function (alias) {
-            queries.push({ query: 'INSERT INTO mailboxes (name, aliasTarget, ownerId, ownerType) VALUES (?, ?, ?, ?)',
-                         args: [ alias, name, results[0].ownerId, results[0].ownerType ] });
+            queries.push({ query: 'INSERT INTO mailboxes (name, domain, aliasTarget, ownerId, ownerType) VALUES (?, ?, ?, ?, ?)',
+                args: [ alias, domain, name, results[0].ownerId, results[0].ownerType ] });
        });

        database.transaction(queries, function (error) {
@@ -181,11 +203,12 @@ function setAliasesForName(name, aliases, callback) {
    });
 }

-function getAliasesForName(name, callback) {
+function getAliasesForName(name, domain, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT name FROM mailboxes WHERE aliasTarget=? ORDER BY name', [ name ], function (error, results) {
+    database.query('SELECT name FROM mailboxes WHERE aliasTarget = ? AND domain = ? ORDER BY name', [ name, domain ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

        results = results.map(function (r) { return r.name; });
@@ -193,21 +216,23 @@ function getAliasesForName(name, callback) {
    });
 }

-function listAliases(callback) {
+function listAliases(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE aliasTarget IS NOT NULL ORDER BY name', function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND aliasTarget IS NOT NULL ORDER BY name', [ domain ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

        callback(null, results);
    });
 }

-function getAlias(name, callback) {
+function getAlias(name, domain, callback) {
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND aliasTarget IS NOT NULL', [ name ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND aliasTarget IS NOT NULL', [ name, domain ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

@@ -0,0 +1,122 @@
+'use strict';
+
+exports = module.exports = {
+    add: add,
+    del: del,
+    get: get,
+    getAll: getAll,
+    update: update,
+
+    _clear: clear,
+
+    TYPE_USER: 'user',
+    TYPE_APP: 'app',
+    TYPE_GROUP: 'group'
+};
+
+var assert = require('assert'),
+    database = require('./database.js'),
+    DatabaseError = require('./databaseerror.js'),
+    safe = require('safetydance');
+
+var MAILDB_FIELDS = [ 'domain', 'enabled', 'mailFromValidation', 'catchAllJson', 'relayJson' ].join(',');
+
+function postProcess(data) {
+    data.enabled = !!data.enabled; // int to boolean
+    data.mailFromValidation = !!data.mailFromValidation; // int to boolean
+
+    data.catchAll = safe.JSON.parse(data.catchAllJson) || [ ];
+    delete data.catchAllJson;
+
+    data.relay = safe.JSON.parse(data.relayJson) || { provider: 'cloudron-smtp' };
+    delete data.relayJson;
+
+    return data;
+}
+
+function add(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+
+    database.query('INSERT INTO mail (domain) VALUES (?)', [ domain ], function (error) {
+        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mail domain already exists'));
+        if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND), 'no such domain');
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function clear(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('TRUNCATE TABLE mail', [], function (error) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        callback(null);
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    // deletes aliases as well
+    database.query('DELETE FROM mail WHERE domain=?', [ domain ], function (error, result) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null);
+    });
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('SELECT ' + MAILDB_FIELDS + ' FROM mail WHERE domain = ?', [ domain ], function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null, postProcess(results[0]));
+    });
+}
+
+function getAll(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('SELECT ' + MAILDB_FIELDS + ' FROM mail ORDER BY domain', function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        results.forEach(function (result) { postProcess(result); });
+
+        callback(null, results);
+    });
+}
+
+function update(domain, data, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof data, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var args = [ ];
+    var fields = [ ];
+    for (var k in data) {
+        if (k === 'catchAll') {
+            fields.push('catchAllJson = ?');
+            args.push(JSON.stringify(data[k]));
+        } else if (k === 'relay') {
+            fields.push('relayJson = ?');
+            args.push(JSON.stringify(data[k]));
+        } else {
+            fields.push(k + ' = ?');
+            args.push(data[k]);
+        }
+    }
+    args.push(domain);
+
+    database.query('UPDATE mail SET ' + fields.join(', ') + ' WHERE domain=?', args, function (error, result) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null);
+    });
+}
@@ -1,9 +1,6 @@
 'use strict';

 exports = module.exports = {
-    start: start,
-    stop: stop,
-
    userAdded: userAdded,
    userRemoved: userRemoved,
    adminChanged: adminChanged,
@@ -23,27 +20,19 @@ exports = module.exports = {

    certificateRenewalError: certificateRenewalError,

-    FEEDBACK_TYPE_FEEDBACK: 'feedback',
-    FEEDBACK_TYPE_TICKET: 'ticket',
-    FEEDBACK_TYPE_APP_MISSING: 'app_missing',
-    FEEDBACK_TYPE_APP_ERROR: 'app_error',
-    FEEDBACK_TYPE_UPGRADE_REQUEST: 'upgrade_request',
-    sendFeedback: sendFeedback,
-
    sendTestMail: sendTestMail,

    _getMailQueue: _getMailQueue,
    _clearMailQueue: _clearMailQueue
 };

-var appstore = require('./appstore.js'),
-    AppstoreError = appstore.AppstoreError,
-    assert = require('assert'),
+var assert = require('assert'),
    async = require('async'),
    config = require('./config.js'),
    debug = require('debug')('box:mailer'),
    docker = require('./docker.js').connection,
    ejs = require('ejs'),
+    mail = require('./mail.js'),
    nodemailer = require('nodemailer'),
    path = require('path'),
    safe = require('safetydance'),
@@ -58,8 +47,7 @@ var NOOP_CALLBACK = function (error) { if (error) debug(error); };

 var MAIL_TEMPLATES_DIR = path.join(__dirname, 'mail_templates');

-var gMailQueue = [ ],
-    gPaused = false;
+var gMailQueue = [ ];

 function splatchError(error) {
    var result = { };
@@ -72,34 +60,39 @@ function splatchError(error) {
    return util.inspect(result, { depth: null, showHidden: true });
 }

-function start(callback) {
+// This will collect the most common details required for notification emails
+function getMailConfig(callback) {
    assert.strictEqual(typeof callback, 'function');

-    if (process.env.BOX_ENV === 'test') gPaused = true;
+    getAdminEmails(function (error, adminEmails) {
+        if (error) return callback(error);

-    callback(null);
+        settings.getCloudronName(function (error, cloudronName) {
+            // this is not fatal
+            if (error) {
+                debug(error);
+                cloudronName = 'Cloudron';
+            }
+
+            mail.getAll(function (error, domains) {
+                if (error) return callback(error);
+                if (domains.length === 0) return callback('No domains configured');
+
+                const defaultDomain = domains[0];
+
+                callback(null, {
+                    adminEmails: adminEmails,
+                    cloudronName: cloudronName,
+                    notificationDomain: defaultDomain.domain,
+                    notificationFrom: `"${cloudronName}" <no-reply@${defaultDomain.domain}>`
+                });
+            });
+        });
+    });
 }

-function stop(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    // TODO: interrupt processQueue as well
-
-    debug(gMailQueue.length + ' mail items dropped');
-    gMailQueue = [ ];
-
-    callback(null);
-}
-
-function mailConfig() {
-    return {
-        from: '"Cloudron" <no-reply@' + config.fqdn() + '>'
-    };
-}

 function processQueue() {
-    assert(!gPaused);
-
    sendMails(gMailQueue);
    gMailQueue = [ ];
 }
@@ -146,7 +139,7 @@ function enqueue(mailOptions) {
    debug('Queued mail for ' + mailOptions.from + ' to ' + mailOptions.to);
    gMailQueue.push(mailOptions);

-    if (!gPaused) processQueue();
+    if (process.env.BOX_ENV !== 'test') processQueue();
 }

 function render(templateFile, params) {
@@ -171,7 +164,7 @@ function getAdminEmails(callback) {
        if (admins.length === 0) return callback(new Error('No admins on this cloudron')); // box not activated yet

        var adminEmails = [ ];
-        if (admins[0].alternateEmail) adminEmails.push(admins[0].alternateEmail);
+        adminEmails.push(admins[0].fallbackEmail);
        admins.forEach(function (admin) { adminEmails.push(admin.email); });

        callback(null, adminEmails);
@@ -182,16 +175,16 @@ function mailUserEventToAdmins(user, event) {
    assert.strictEqual(typeof user, 'object');
    assert.strictEqual(typeof event, 'string');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-        adminEmails = _.difference(adminEmails, [ user.email ]);
+        var adminEmails = _.difference(mailConfig.adminEmails, [ user.email ]);

        var mailOptions = {
-            from: mailConfig().from,
+            from: mailConfig.notificationFrom,
            to: adminEmails.join(', '),
-            subject: util.format('[%s] %s %s', config.fqdn(), user.username || user.alternateEmail || user.email, event),
-            text: render('user_event.ejs', { fqdn: config.fqdn(), user: user, event: event, format: 'text' }),
+            subject: util.format('[%s] %s %s', mailConfig.cloudronName, user.username || user.fallbackEmail || user.email, event),
+            text: render('user_event.ejs', { user: user, event: event, format: 'text' }),
        };

        enqueue(mailOptions);
@@ -204,19 +197,15 @@ function sendInvite(user, invitor) {

    debug('Sending invite mail');

-    settings.getCloudronName(function (error, cloudronName) {
-        if (error) {
-            debug(error);
-            cloudronName = 'Cloudron';
-        }
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var templateData = {
            user: user,
            webadminUrl: config.adminOrigin(),
            setupLink: config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
-            fqdn: config.fqdn(),
            invitor: invitor,
-            cloudronName: cloudronName,
+            cloudronName: mailConfig.cloudronName,
            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
        };

@@ -227,9 +216,9 @@ function sendInvite(user, invitor) {
        templateDataHTML.format = 'html';

        var mailOptions = {
-            from: mailConfig().from,
-            to: user.alternateEmail || user.email,
-            subject: util.format('Welcome to %s', cloudronName),
+            from: mailConfig.notificationFrom,
+            to: user.fallbackEmail,
+            subject: util.format('Welcome to %s', mailConfig.cloudronName),
            text: render('welcome_user.ejs', templateDataText),
            html: render('welcome_user.ejs', templateDataHTML)
        };
@@ -244,41 +233,33 @@ function userAdded(user, inviteSent) {

    debug('Sending mail for userAdded %s including invite link', inviteSent ? 'not' : '');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-        adminEmails = _.difference(adminEmails, [ user.email ]);
+        var adminEmails = _.difference(mailConfig.adminEmails, [ user.email ]);

-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) {
-                debug(error);
-                cloudronName = 'Cloudron';
-            }
+        var templateData = {
+            user: user,
+            inviteLink: inviteSent ? null : config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
+            cloudronName: mailConfig.cloudronName,
+            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+        };

-            var templateData = {
-                fqdn: config.fqdn(),
-                user: user,
-                inviteLink: inviteSent ? null : config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
-                cloudronName: cloudronName,
-                cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
-            };
+        var templateDataText = JSON.parse(JSON.stringify(templateData));
+        templateDataText.format = 'text';

-            var templateDataText = JSON.parse(JSON.stringify(templateData));
-            templateDataText.format = 'text';
+        var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+        templateDataHTML.format = 'html';

-            var templateDataHTML = JSON.parse(JSON.stringify(templateData));
-            templateDataHTML.format = 'html';
+        var mailOptions = {
+            from: mailConfig.notificationFrom,
+            to: adminEmails.join(', '),
+            subject: util.format('[%s] User %s added', mailConfig.cloudronName, user.fallbackEmail),
+            text: render('user_added.ejs', templateDataText),
+            html: render('user_added.ejs', templateDataHTML)
+        };

-            var mailOptions = {
-                from: mailConfig().from,
-                to: adminEmails.join(', '),
-                subject: util.format('[%s] User %s added', config.fqdn(), user.alternateEmail || user.email),
-                text: render('user_added.ejs', templateDataText),
-                html: render('user_added.ejs', templateDataHTML)
-            };
-
-            enqueue(mailOptions);
-        });
+        enqueue(mailOptions);
    });
 }

@@ -304,17 +285,13 @@ function passwordReset(user) {

    debug('Sending mail for password reset for user %s.', user.email, user.id);

-    settings.getCloudronName(function (error, cloudronName) {
-        if (error) {
-            debug(error);
-            cloudronName = 'Cloudron';
-        }
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var templateData = {
-            fqdn: config.fqdn(),
            user: user,
            resetLink: config.adminOrigin() + '/api/v1/session/password/reset.html?reset_token=' + user.resetToken,
-            cloudronName: cloudronName,
+            cloudronName: mailConfig.cloudronName,
            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
        };

@@ -325,9 +302,9 @@ function passwordReset(user) {
        templateDataHTML.format = 'html';

        var mailOptions = {
-            from: mailConfig().from,
-            to: user.alternateEmail || user.email,
-            subject: util.format('[%s] Password Reset', config.fqdn()),
+            from: mailConfig.notificationFrom,
+            to: user.fallbackEmail,
+            subject: util.format('[%s] Password Reset', mailConfig.cloudronName),
            text: render('password_reset.ejs', templateDataText),
            html: render('password_reset.ejs', templateDataHTML)
        };
@@ -341,14 +318,14 @@ function appDied(app) {

    debug('Sending mail for app %s @ %s died', app.id, app.fqdn);

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var mailOptions = {
-            from: mailConfig().from,
-            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
-            subject: util.format('[%s] App %s is down', config.fqdn(), app.fqdn),
-            text: render('app_down.ejs', { fqdn: config.fqdn(), title: app.manifest.title, appFqdn: app.fqdn, format: 'text' })
+            from: mailConfig.notificationFrom,
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
+            subject: util.format('[%s] App %s is down', mailConfig.cloudronName, app.fqdn),
+            text: render('app_down.ejs', { title: app.manifest.title, appFqdn: app.fqdn, format: 'text' })
        };

        enqueue(mailOptions);
@@ -360,44 +337,36 @@ function boxUpdateAvailable(hasSubscription, newBoxVersion, changelog) {
    assert.strictEqual(typeof newBoxVersion, 'string');
    assert(util.isArray(changelog));

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) {
-                debug(error);
-                cloudronName = 'Cloudron';
-            }
+        var converter = new showdown.Converter();

-            var converter = new showdown.Converter();
+        var templateData = {
+            webadminUrl: config.adminOrigin(),
+            newBoxVersion: newBoxVersion,
+            hasSubscription: hasSubscription,
+            changelog: changelog,
+            changelogHTML: changelog.map(function (e) { return converter.makeHtml(e); }),
+            cloudronName: mailConfig.cloudronName,
+            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+        };

-            var templateData = {
-                fqdn: config.fqdn(),
-                webadminUrl: config.adminOrigin(),
-                newBoxVersion: newBoxVersion,
-                hasSubscription: hasSubscription,
-                changelog: changelog,
-                changelogHTML: changelog.map(function (e) { return converter.makeHtml(e); }),
-                cloudronName: cloudronName,
-                cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
-            };
+        var templateDataText = JSON.parse(JSON.stringify(templateData));
+        templateDataText.format = 'text';

-            var templateDataText = JSON.parse(JSON.stringify(templateData));
-            templateDataText.format = 'text';
+        var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+        templateDataHTML.format = 'html';

-            var templateDataHTML = JSON.parse(JSON.stringify(templateData));
-            templateDataHTML.format = 'html';
+        var mailOptions = {
+            from: mailConfig.notificationFrom,
+            to: mailConfig.adminEmails.join(', '),
+            subject: util.format('%s has a new update available', mailConfig.cloudronName),
+            text: render('box_update_available.ejs', templateDataText),
+            html: render('box_update_available.ejs', templateDataHTML)
+        };

-            var mailOptions = {
-                from: mailConfig().from,
-                to: adminEmails.join(', '),
-                subject: util.format('%s has a new update available', config.fqdn()),
-                text: render('box_update_available.ejs', templateDataText),
-                html: render('box_update_available.ejs', templateDataHTML)
-            };
-
-            enqueue(mailOptions);
-        });
+        enqueue(mailOptions);
    });
 }

@@ -406,97 +375,81 @@ function appUpdateAvailable(app, hasSubscription, info) {
    assert.strictEqual(typeof hasSubscription, 'boolean');
    assert.strictEqual(typeof info, 'object');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) {
-                debug(error);
-                cloudronName = 'Cloudron';
-            }
+        var converter = new showdown.Converter();

-            var converter = new showdown.Converter();
+        var templateData = {
+            webadminUrl: config.adminOrigin(),
+            hasSubscription: hasSubscription,
+            app: app,
+            updateInfo: info,
+            changelogHTML: converter.makeHtml(info.manifest.changelog),
+            cloudronName: mailConfig.cloudronName,
+            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+        };

-            var templateData = {
-                fqdn: config.fqdn(),
-                webadminUrl: config.adminOrigin(),
-                hasSubscription: hasSubscription,
-                app: app,
-                updateInfo: info,
-                changelogHTML: converter.makeHtml(info.manifest.changelog),
-                cloudronName: cloudronName,
-                cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
-            };
+        var templateDataText = JSON.parse(JSON.stringify(templateData));
+        templateDataText.format = 'text';

-            var templateDataText = JSON.parse(JSON.stringify(templateData));
-            templateDataText.format = 'text';
+        var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+        templateDataHTML.format = 'html';

-            var templateDataHTML = JSON.parse(JSON.stringify(templateData));
-            templateDataHTML.format = 'html';
+        var mailOptions = {
+            from: mailConfig.notificationFrom,
+            to: mailConfig.adminEmails.join(', '),
+            subject: util.format('App %s has a new update available', app.fqdn),
+            text: render('app_update_available.ejs', templateDataText),
+            html: render('app_update_available.ejs', templateDataHTML)
+        };

-            var mailOptions = {
-                from: mailConfig().from,
-                to: adminEmails.join(', '),
-                subject: util.format('App %s has a new update available', app.fqdn),
-                text: render('app_update_available.ejs', templateDataText),
-                html: render('app_update_available.ejs', templateDataHTML)
-            };
-
-            enqueue(mailOptions);
-        });
+        enqueue(mailOptions);
    });
 }

 function sendDigest(info) {
    assert.strictEqual(typeof info, 'object');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) {
-                debug(error);
-                cloudronName = 'Cloudron';
-            }
+        var templateData = {
+            webadminUrl: config.adminOrigin(),
+            cloudronName: mailConfig.cloudronName,
+            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar',
+            info: info
+        };

-            var templateData = {
-                fqdn: config.fqdn(),
-                webadminUrl: config.adminOrigin(),
-                cloudronName: cloudronName,
-                cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar',
-                info: info
-            };
+        var templateDataText = JSON.parse(JSON.stringify(templateData));
+        templateDataText.format = 'text';

-            var templateDataText = JSON.parse(JSON.stringify(templateData));
-            templateDataText.format = 'text';
+        var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+        templateDataHTML.format = 'html';

-            var templateDataHTML = JSON.parse(JSON.stringify(templateData));
-            templateDataHTML.format = 'html';
+        var mailOptions = {
+            from: mailConfig.notificationFrom,
+            to: mailConfig.adminEmails.join(', '),
+            subject: util.format('[%s] Cloudron - Weekly activity digest', mailConfig.cloudronName),
+            text: render('digest.ejs', templateDataText),
+            html: render('digest.ejs', templateDataHTML)
+        };

-            var mailOptions = {
-                from: mailConfig().from,
-                to: adminEmails.join(', '),
-                subject: util.format('[%s] Cloudron - Weekly activity digest', config.fqdn()),
-                text: render('digest.ejs', templateDataText),
-                html: render('digest.ejs', templateDataHTML)
-            };
-
-            enqueue(mailOptions);
-        });
+        enqueue(mailOptions);
    });
 }

 function outOfDiskSpace(message) {
    assert.strictEqual(typeof message, 'string');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var mailOptions = {
-            from: mailConfig().from,
-            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
-            subject: util.format('[%s] Out of disk space alert', config.fqdn()),
-            text: render('out_of_disk_space.ejs', { fqdn: config.fqdn(), message: message, format: 'text' })
+            from: mailConfig.notificationFrom,
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
+            subject: util.format('[%s] Out of disk space alert', mailConfig.cloudronName),
+            text: render('out_of_disk_space.ejs', { cloudronName: mailConfig.cloudronName, message: message, format: 'text' })
        };

        sendMails([ mailOptions ]);
@@ -506,14 +459,14 @@ function outOfDiskSpace(message) {
 function backupFailed(error) {
    var message = splatchError(error);

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var mailOptions = {
-            from: mailConfig().from,
-            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
-            subject: util.format('[%s] Failed to backup', config.fqdn()),
-            text: render('backup_failed.ejs', { fqdn: config.fqdn(), message: message, format: 'text' })
+            from: mailConfig.notificationFrom,
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
+            subject: util.format('[%s] Failed to backup', mailConfig.cloudronName),
+            text: render('backup_failed.ejs', { cloudronName: mailConfig.cloudronName, message: message, format: 'text' })
        };

        enqueue(mailOptions);
@@ -524,12 +477,12 @@ function certificateRenewalError(domain, message) {
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof message, 'string');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var mailOptions = {
-            from: mailConfig().from,
-            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
+            from: mailConfig.notificationFrom,
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
            subject: util.format('[%s] Certificate renewal error', domain),
            text: render('certificate_renewal_error.ejs', { domain: domain, message: message, format: 'text' })
        };
@@ -542,14 +495,14 @@ function oomEvent(program, context) {
    assert.strictEqual(typeof program, 'string');
    assert.strictEqual(typeof context, 'string');

-    getAdminEmails(function (error, adminEmails) {
-        if (error) return debug('Error getting admins', error);
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

        var mailOptions = {
-            from: mailConfig().from,
-            to: config.provider() === 'caas' ? 'support@cloudron.io' : adminEmails.join(', '),
-            subject: util.format('[%s] %s exited unexpectedly', config.fqdn(), program),
-            text: render('oom_event.ejs', { fqdn: config.fqdn(), program: program, context: context, format: 'text' })
+            from: mailConfig.notificationFrom,
+            to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
+            subject: util.format('[%s] %s exited unexpectedly', mailConfig.cloudronName, program),
+            text: render('oom_event.ejs', { cloudronName: mailConfig.cloudronName, program: program, context: context, format: 'text' })
        };

        sendMails([ mailOptions ]);
@@ -557,7 +510,7 @@ function oomEvent(program, context) {
 }

 // this function bypasses the queue intentionally. it is also expected to work without the mailer module initialized
-// NOTE: crashnotifier should be able to send mail when there is no db
+// NOTE: crashnotifier should ideally be able to send mail when there is no db, however we need the 'from' address domain from the db
 function unexpectedExit(program, context, callback) {
    assert.strictEqual(typeof program, 'string');
    assert.strictEqual(typeof context, 'string');
@@ -565,49 +518,36 @@ function unexpectedExit(program, context, callback) {

    if (config.provider() !== 'caas') return callback(); // no way to get admins without db access

-    var mailOptions = {
-        from: mailConfig().from,
-        to: 'support@cloudron.io',
-        subject: util.format('[%s] %s exited unexpectedly', config.fqdn(), program),
-        text: render('unexpected_exit.ejs', { fqdn: config.fqdn(), program: program, context: context, format: 'text' })
-    };
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-    sendMails([ mailOptions ], callback);
+        var mailOptions = {
+            from: mailConfig.notificationFrom,
+            to: 'support@cloudron.io',
+            subject: util.format('[%s] %s exited unexpectedly', mailConfig.cloudronName, program),
+            text: render('unexpected_exit.ejs', { cloudronName: mailConfig.cloudronName, program: program, context: context, format: 'text' })
+        };
+
+        sendMails([ mailOptions ], callback);
+    });
 }

-function sendFeedback(user, type, subject, description) {
-    assert.strictEqual(typeof user, 'object');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof subject, 'string');
-    assert.strictEqual(typeof description, 'string');
-
-    assert(type === exports.FEEDBACK_TYPE_TICKET ||
-        type === exports.FEEDBACK_TYPE_FEEDBACK ||
-        type === exports.FEEDBACK_TYPE_APP_MISSING ||
-        type === exports.FEEDBACK_TYPE_UPGRADE_REQUEST ||
-        type === exports.FEEDBACK_TYPE_APP_ERROR);
-
-    var mailOptions = {
-        from: mailConfig().from,
-        to: 'support@cloudron.io',
-        subject: util.format('[%s] %s - %s', type, config.fqdn(), subject),
-        text: render('feedback.ejs', { fqdn: config.fqdn(), type: type, user: user, subject: subject, description: description, format: 'text'})
-    };
-
-    enqueue(mailOptions);
-}
-
-function sendTestMail(email) {
+function sendTestMail(domain, email) {
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof email, 'string');

-    var mailOptions = {
-        from: mailConfig().from,
-        to: email,
-        subject: util.format('Test Email from %s', config.fqdn()),
-        text: render('test.ejs', { fqdn: config.fqdn(), format: 'text'})
-    };
+    getMailConfig(function (error, mailConfig) {
+        if (error) return debug('Error getting mail details:', error);

-    enqueue(mailOptions);
+        var mailOptions = {
+            from: `"${mailConfig.cloudronName}" <no-reply@${domain}>`,
+            to: email,
+            subject: util.format('Test Email from %s', mailConfig.cloudronName),
+            text: render('test.ejs', { cloudronName: mailConfig.cloudronName, format: 'text'})
+        };
+
+        enqueue(mailOptions);
+    });
 }

 function _getMailQueue() {
--- a/Show More
+++ b/Show More