caas can be a provider

Cloudron is always rolling releases and we never break compat

CHANGES

@@ -1190,3 +1190,23 @@
 * 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
+
+[1.11.0]
+* Update Haraka to 2.8.17 to fix various crashes
+* Report dependency error for clone if backup or domain was not found
+* Enable auto-updates for major versions
+

migrations/20180121124206-users-add-fallbackEmail.js

@@ -11,6 +11,7 @@ exports.up = function(db, callback) {
 
             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) {
@@ -21,13 +22,14 @@ exports.up = function(db, callback) {
                             defaultEmail = user.email;
                             fallbackEmail = user.email;
                         } else {
-                            defaultEmail = user.username + '@' + mailDomains[0].domain;
+                            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);
         });

scripts/cloudron-setup

@@ -88,6 +88,7 @@ if [[ -z "${provider}" ]]; then
 elif [[  \
             "${provider}" != "ami" && \
             "${provider}" != "azure" && \
+            "${provider}" != "caas" && \
             "${provider}" != "cloudscale" && \
             "${provider}" != "digitalocean" && \
             "${provider}" != "ec2" && \

scripts/createReleaseTarball

@@ -40,7 +40,8 @@ if [[ "$(node --version)" != "v8.9.3" ]]; then
 fi
 
 box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
-webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && 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-${box_version:0:10}-${webadmin_version:0:10}.tar.gz"
 

src/apps.js

@@ -890,7 +890,7 @@ function clone(appId, data, auditSource, callback) {
 
         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 && error.reason === BackupsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Backup not found'));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
             if (!backupInfo.manifest) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config'));
@@ -903,7 +903,7 @@ function clone(appId, data, auditSource, callback) {
             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 && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
                 var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);

src/cron.js

@@ -204,12 +204,8 @@ function autoupdatePatternChanged(pattern) {
         onTick: function() {
             var updateInfo = updateChecker.getUpdateInfo();
             if (updateInfo.box) {
-                if (semver.major(updateInfo.box.version) === semver.major(config.version())) {
-                    debug('Starting autoupdate to %j', updateInfo.box);
-                    cloudron.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
-                } else {
-                    debug('Block automatic update for major version');
-                }
+                debug('Starting autoupdate to %j', updateInfo.box);
+                cloudron.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
             } else if (updateInfo.apps) {
                 debug('Starting app update to %j', updateInfo.apps);
                 apps.autoupdateApps(updateInfo.apps, AUDIT_SOURCE, NOOP_CALLBACK);

src/infra_version.js

@@ -18,7 +18,7 @@ exports = module.exports = {
         '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' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.1.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:1.0.0' }
     }
 };

src/mail.js

@@ -741,7 +741,7 @@ function setMailFromValidation(domain, enabled, callback) {
         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);
+        restartMail(NOOP_CALLBACK); // have to restart mail container since haraka cannot watch symlinked config files (mail.ini)
 
         callback(null);
     });
@@ -756,7 +756,7 @@ function setCatchAllAddress(domain, address, callback) {
         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);
+        restartMail(NOOP_CALLBACK); // have to restart mail container since haraka cannot watch symlinked config files (mail.ini)
 
         callback(null);
     });

src/setup.js

@@ -73,7 +73,7 @@ function SetupError(reason, errorOrMessage) {
 }
 util.inherits(SetupError, Error);
 SetupError.BAD_FIELD = 'Field error';
-SetupError.BAD_STATE = 'Field error';
+SetupError.BAD_STATE = 'Bad State';
 SetupError.ALREADY_SETUP = 'Already Setup';
 SetupError.INTERNAL_ERROR = 'Internal Error';
 SetupError.EXTERNAL_ERROR = 'External Error';
@@ -184,6 +184,8 @@ function dnsSetup(adminFqdn, domain, zoneName, provider, dnsConfig, tlsConfig, c
 
     if (config.adminDomain()) return callback(new SetupError(SetupError.ALREADY_SETUP));
 
+    if (gWebadminStatus.configuring || gWebadminStatus.restoring) return callback(new SetupError(SetupError.BAD_STATE, 'Already restoring or configuring'));
+
     if (!zoneName) zoneName = tld.getDomain(domain) || domain;
 
     debug('dnsSetup: Setting up Cloudron with domain %s and zone %s', domain, zoneName);
@@ -291,6 +293,8 @@ function restore(backupConfig, backupId, version, callback) {
     if (!semver.valid(version)) return callback(new SetupError(SetupError.BAD_STATE, 'version is not a valid semver'));
     if (semver.major(config.version()) !== semver.major(version) || semver.minor(config.version()) !== semver.minor(version)) return callback(new SetupError(SetupError.BAD_STATE, `Run cloudron-setup with --version ${version} to restore from this backup`));
 
+    if (gWebadminStatus.configuring || gWebadminStatus.restoring) return callback(new SetupError(SetupError.BAD_STATE, 'Already restoring or configuring'));
+
     user.count(function (error, count) {
         if (error) return callback(new SetupError(SetupError.INTERNAL_ERROR, error));
         if (count) return callback(new SetupError(SetupError.ALREADY_PROVISIONED, 'Already activated'));