diff --git a/migrations/20170919185109-settings-set-backupFolder.js b/migrations/20170919185109-settings-set-backupConfig-defaults.js similarity index 70% rename from migrations/20170919185109-settings-set-backupFolder.js rename to migrations/20170919185109-settings-set-backupConfig-defaults.js index 404239145..91dec1660 100644 --- a/migrations/20170919185109-settings-set-backupFolder.js +++ b/migrations/20170919185109-settings-set-backupConfig-defaults.js @@ -1,14 +1,16 @@ 'use strict'; -// ensure backupFolder has not empty +// ensure backupFolder and format are not empty exports.up = function(db, callback) { db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, result) { if (error || result.length === 0) return callback(error); var value = JSON.parse(result[0].value); - if (value.provider !== 'filesystem' || value.backupFolder) return callback(); + value.format = 'tgz'; // set the format - value.backupFolder = '/var/backups'; + if (value.provider === 'filesystem' && !value.backupFolder) { + value.backupFolder = '/var/backups'; // set the backupFolder + } db.runSql('UPDATE settings SET value = ? WHERE name = ?', [ JSON.stringify(value), 'backup_config' ], function (error) { if (error) console.error('Error setting ownerid ' + JSON.stringify(u) + error); diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup index de179e187..c21b3431c 100755 --- a/scripts/cloudron-setup +++ b/scripts/cloudron-setup @@ -209,6 +209,7 @@ if [[ -z "${dataJson}" ]]; then "provider": "filesystem", "backupFolder": "/var/backups", "key": "${encryptionKey}", + "format": "tgz", "retentionSecs": 172800 }, "updateConfig": {