diff --git a/migrations/20171205124434-settings-default-backupConfig.js b/migrations/20171205124434-settings-default-backupConfig.js new file mode 100644 index 000000000..d71f41742 --- /dev/null +++ b/migrations/20171205124434-settings-default-backupConfig.js @@ -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); + }); +}; diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup index ea58594ae..23f53a3ed 100755 --- a/scripts/cloudron-setup +++ b/scripts/cloudron-setup @@ -48,8 +48,6 @@ domain="" adminLocation="my" zoneName="" provider="" -encryptionKey="" -restoreUrl="" tlsProvider="le-prod" requestedVersion="" apiServerOrigin="https://api.cloudron.io" @@ -60,6 +58,10 @@ sourceTarballUrl="" rebootServer="true" baseDataDir="" +# these are here for pre-1.9 compat +encryptionKey="" +restoreUrl="" + 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" -- "$@") eval set -- "${args}" @@ -264,13 +266,6 @@ autoprovision_data=$(cat <