diff --git a/setup/start/cloudron-firewall.sh b/setup/start/cloudron-firewall.sh index 4734964ad..f9ef850b3 100755 --- a/setup/start/cloudron-firewall.sh +++ b/setup/start/cloudron-firewall.sh @@ -9,7 +9,7 @@ iptables -t filter -F CLOUDRON # empty any existing rules # NOTE: keep these in sync with src/apps.js validatePortBindings # allow ssh, http, https, ping, dns iptables -t filter -I CLOUDRON -m state --state RELATED,ESTABLISHED -j ACCEPT -# caas has ssh on port 202 +# ssh is allowed alternately on port 202 iptables -A CLOUDRON -p tcp -m tcp -m multiport --dports 22,25,80,202,443,587,993,4190 -j ACCEPT iptables -t filter -A CLOUDRON -p icmp --icmp-type echo-request -j ACCEPT diff --git a/src/apps.js b/src/apps.js index 17e218273..3c0a4151d 100644 --- a/src/apps.js +++ b/src/apps.js @@ -143,7 +143,7 @@ function validatePortBindings(portBindings, manifest) { 53, /* dns */ 80, /* http */ 143, /* imap */ - 202, /* caas ssh */ + 202, /* alternate ssh */ 222, /* proftd */ 443, /* https */ 465, /* smtps */ diff --git a/src/backups.js b/src/backups.js index 6766a6deb..e3a5dcbec 100644 --- a/src/backups.js +++ b/src/backups.js @@ -105,7 +105,6 @@ BackupsError.NOT_FOUND = 'not found'; // choose which storage backend we use for test purpose we use s3 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'); diff --git a/src/config.js b/src/config.js index 91a72c5aa..6142c1955 100644 --- a/src/config.js +++ b/src/config.js @@ -26,7 +26,7 @@ exports = module.exports = { // these values are derived adminOrigin: adminOrigin, internalAdminOrigin: internalAdminOrigin, - sysadminOrigin: sysadminOrigin, // caas routes + sysadminOrigin: sysadminOrigin, // localhost routes adminFqdn: adminFqdn, mailFqdn: mailFqdn, hasIPv6: hasIPv6, diff --git a/src/routes/test/sysadmin-test.js b/src/routes/test/sysadmin-test.js index 6aa7805b2..569966ecf 100644 --- a/src/routes/test/sysadmin-test.js +++ b/src/routes/test/sysadmin-test.js @@ -52,7 +52,7 @@ function setup(done) { }, function createSettings(callback) { - settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', boxId: 'boxid', key: 'key', prefix: 'boxid', format: 'tgz'}), callback); + settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'filesystem', backupFolder: '/tmp/backups', prefix: 'boxid', format: 'tgz'}), callback); } ], done); } diff --git a/src/test/apps-test.js b/src/test/apps-test.js index 5cd31e620..f6a4fed73 100644 --- a/src/test/apps-test.js +++ b/src/test/apps-test.js @@ -180,7 +180,6 @@ describe('Apps', function () { appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.ownerId, apps._translatePortBindings(APP_0.portBindings, APP_0.manifest), APP_0), appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.domain, APP_1.ownerId, apps._translatePortBindings(APP_1.portBindings, APP_1.manifest), APP_1), appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.domain, APP_2.ownerId, apps._translatePortBindings(APP_2.portBindings, APP_2.manifest), APP_2), - settingsdb.set.bind(null, settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' })) ], done); }); diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js index 650e69cf1..12bdf4237 100644 --- a/src/test/apptask-test.js +++ b/src/test/apptask-test.js @@ -101,7 +101,7 @@ describe('apptask', function () { before(function (done) { config._reset(); config.setFqdn(DOMAIN_0.domain); - config.set('provider', 'caas'); + config.set('provider', 'digitalocean'); awsHostedZones = { HostedZones: [{ diff --git a/src/test/mail-test.js b/src/test/mail-test.js index 24335aca2..e9418a6a2 100644 --- a/src/test/mail-test.js +++ b/src/test/mail-test.js @@ -31,7 +31,7 @@ const AUDIT_SOURCE = { function setup(done) { config._reset(); config.set('fqdn', 'example.com'); - config.set('provider', 'caas'); + config.set('provider', 'digitalocean'); async.series([ database.initialize, diff --git a/src/test/server-test.js b/src/test/server-test.js index d63c35017..43a92082a 100644 --- a/src/test/server-test.js +++ b/src/test/server-test.js @@ -23,7 +23,7 @@ describe('Server', function () { before(function () { config._reset(); config.setFqdn(DOMAIN); - config.set('provider', 'notcaas'); // otherwise, cron sets a caas timer for heartbeat causing the test to not quit + config.set('provider', 'digitalocean'); }); after(cleanup); diff --git a/src/test/settings-test.js b/src/test/settings-test.js index 243da2c08..626c0102a 100644 --- a/src/test/settings-test.js +++ b/src/test/settings-test.js @@ -23,7 +23,7 @@ var DOMAIN_0 = 'example.com'; function setup(done) { config._reset(); config.set('fqdn', DOMAIN_0); - config.set('provider', 'caas'); + config.set('provider', 'digitalocean'); nock.cleanAll(); async.series([ @@ -33,11 +33,7 @@ function setup(done) { s3._mockInject(MockS3); - // a cloudron must have a backup config to startup - settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'foo', key: 'key', format: 'tgz'}), function (error) { - expect(error).to.be(null); - callback(); - }); + callback(); } ], done); } @@ -97,22 +93,11 @@ describe('Settings', function () { }); }); - it('can set backup config', function (done) { - nock(config.apiServerOrigin()) - .post(`/api/v1/caas/boxes/boxid/awscredentials?token=TOKEN`) - .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } }); - - settings.setBackupConfig({ provider: 'caas', boxId: 'boxid', token: 'TOKEN', format: 'tgz', prefix: 'boxid', bucket: 'bucket' }, function (error) { - expect(error).to.be(null); - done(); - }); - }); - it('can get backup config', function (done) { settings.getBackupConfig(function (error, backupConfig) { expect(error).to.be(null); - expect(backupConfig.provider).to.be('caas'); - expect(backupConfig.token).to.be('TOKEN'); + expect(backupConfig.provider).to.be('filesystem'); + expect(backupConfig.backupFolder).to.be('/var/backups'); done(); }); }); diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js index 703d48756..e5179d1b2 100644 --- a/src/test/updatechecker-test.js +++ b/src/test/updatechecker-test.js @@ -73,7 +73,7 @@ describe('updatechecker - box - manual (email)', function () { config._reset(); config.setFqdn(DOMAIN_0.domain); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); safe.fs.unlinkSync(paths.UPDATE_CHECKER_FILE); mailer._mailQueue = []; @@ -149,7 +149,7 @@ describe('updatechecker - box - automatic (no email)', function () { before(function (done) { config.setFqdn(DOMAIN_0.domain); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); mailer._mailQueue = []; @@ -188,7 +188,7 @@ describe('updatechecker - box - automatic free (email)', function () { config.setFqdn(DOMAIN_0.domain); config.set('version', '1.0.0'); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); mailer._mailQueue = []; @@ -253,7 +253,7 @@ describe('updatechecker - app - manual (email)', function () { config.setFqdn(DOMAIN_0.domain); config.set('version', '1.0.0'); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); mailer._mailQueue = []; @@ -371,7 +371,7 @@ describe('updatechecker - app - automatic (no email)', function () { config.setFqdn(DOMAIN_0.domain); config.set('version', '1.0.0'); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); mailer._mailQueue = []; @@ -445,7 +445,7 @@ describe('updatechecker - app - automatic free (email)', function () { config.setFqdn(DOMAIN_0.domain); config.set('version', '1.0.0'); config.set('apiServerOrigin', 'http://localhost:4444'); - config.set('provider', 'notcaas'); + config.set('provider', 'digitalocean'); mailer._mailQueue = [];