5a2de0bcbb
Merge remote-tracking branch 'origin/master' into feature/gcs
...
# Conflicts:
# webadmin/src/views/certs.js
# webadmin/src/views/settings.js
2017-12-06 22:47:26 +01:00
cb814a50d7
Fix waitForDNSRecord for subdomain installations
2017-12-06 12:31:25 +05:30
5d34559f0a
Fix hostname validation
2017-12-06 07:13:46 +05:30
91ede59241
cloudron-setup: move backupConfig default as migration script
...
if in autoprovision, then the backupConfig ends up being overwritten
after a restore.
2017-12-05 18:21:25 +05:30
778342906e
cloudron-setup: remove dnsConfig
...
this is not really used since dns setup is the first step now
2017-12-05 18:09:25 +05:30
c42f3341ca
cloudron-setup: Add back restore-url and key for pre-1.9
2017-12-05 16:01:16 +05:30
a838b4c521
cloudron-setup: keep pre-1.9 compat for configs
2017-12-05 15:56:47 +05:30
44d4934546
cloudron-setup: create autoprovision.json
2017-12-05 14:55:06 +05:30
49db0d3641
cloudron-setup: remove boxVersionsUrl
2017-12-05 14:53:26 +05:30
2bebed2c19
Add fqdn to caas domain config
2017-12-05 07:16:00 +05:30
2cf2dddcee
Fix display of DNS records when not using cloudron-smtp
...
Fixes #492
2017-12-04 21:24:17 +05:30
306e11ae88
Remove unused requires
2017-12-04 17:10:06 +05:30
568397ec19
caas: send ids in backupDone instead of filenames
2017-11-29 12:39:10 -08:00
459314df17
lock for platform start, so that apps are not installed in between
2017-11-28 23:18:43 -08:00
693bc094cc
caas: make fqdn part of dns and s3 credentials
2017-11-28 22:44:40 -08:00
9cdd2df696
set restoring to false
2017-11-28 15:01:59 -08:00
e9b308bb95
Re-purpose the zoneName as the caas domain
2017-11-28 15:00:38 -08:00
432a369bff
Add token to dnsConfig
2017-11-28 15:00:38 -08:00
76312495fd
Add debug
2017-11-28 15:00:33 -08:00
126d8b9bec
stringify and a typo
2017-11-28 02:30:35 -08:00
d001647704
Change path of autoprovision.conf since /root is not readable
2017-11-28 01:23:10 -08:00
8701b36123
make dnsSetup return any provisioning error
2017-11-28 01:20:18 -08:00
c56a24d4fb
Autoprovision from autoprovision.json
...
This is done so that CaaS restore code path can provision correctly
2017-11-27 22:41:32 -08:00
e6eb54d572
More test fixing
2017-11-27 18:19:20 -08:00
68c26c1d12
Fix route/ tests
2017-11-27 16:01:52 -08:00
437312811d
wrap seconds
2017-11-27 15:41:37 -08:00
68d4e70823
Add config._reset to tests
2017-11-27 15:27:54 -08:00
74f3a4dd6f
remove redundant after()
2017-11-27 14:10:27 -08:00
3a74babcf4
Fix error message
2017-11-27 13:59:56 -08:00
ab2f2c9aab
Remove setTimeout from cron.js
...
this causes scripts to not end since the timeout is not killed
2017-11-27 13:43:25 -08:00
8b11692e37
cron: ensure all jobs are cleaned up
2017-11-27 12:44:04 -08:00
abe04d7d10
ldap: call client.unbind
2017-11-27 12:14:31 -08:00
efe75f0c4e
make tests finish
...
database.uninitialize must be called to drop the connection
2017-11-27 11:57:09 -08:00
b6c20877ea
lint
2017-11-27 10:43:12 -08:00
172d5bbdff
Remove obsolete setting (now migrated into domains table)
2017-11-24 22:45:32 -08:00
6ed7a91cf9
rename migration timestamps so they appear in correct order
...
The following migrations are already released in 1.8.3:
20171116203507-apps-rename-newConfigJson-to-updateConfigJson.js
20171116224051-apps-rename-lastBackupId-to-restoreConfigJson.js
2017-11-24 22:39:29 -08:00
61a7f1a126
mailer.start() is gone remove from test
2017-11-25 00:47:00 +01:00
ba49c1e30c
Remove accidentally commited debug lines
2017-11-25 00:39:44 +01:00
ca5b69a07d
Fix db export/import
2017-11-24 15:31:06 -08:00
998f736e6f
Add database.exportToFile
2017-11-24 15:29:56 -08:00
969f8ad11f
Add 1.9.0 changes
2017-11-24 14:58:43 -08:00
34ec09588a
no need for a special test setup handling in the migration script
2017-11-24 23:48:59 +01:00
4091315589
Make migration down fail if the table cannot be dropped
2017-11-24 23:48:39 +01:00
91fb45584f
Add some changes
2017-11-24 23:01:34 +01:00
180a455299
remove mailer.start and stop
2017-11-24 13:58:40 -08:00
a77bf54df7
cron.initialize is required in domain setup for heartbeats
2017-11-24 13:56:34 -08:00
74abce99ac
Fix some typos in restore api
2017-11-23 16:37:40 -08:00
b2d27ee26a
add 1.8.3 changes
2017-11-24 01:31:15 +01:00
1466104681
Remove obsolete developer mode
2017-11-24 01:31:15 +01:00
4acd0bcdac
Remove --restore-url and --restore-key
2017-11-23 13:33:41 -08:00
Aleksandr Bogdanov