diff --git a/src/js/client.js b/src/js/client.js index ec0035d5e..c4187cad0 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -1114,12 +1114,13 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout }); }; - Client.prototype.restore = function (backupConfig, backupId, version, sysinfoConfig, callback) { + Client.prototype.restore = function (backupConfig, backupId, version, sysinfoConfig, skipDnsSetup, callback) { var data = { backupConfig: backupConfig, backupId: backupId, version: version, - sysinfoConfig: sysinfoConfig + sysinfoConfig: sysinfoConfig, + skipDnsSetup: skipDnsSetup }; post('/api/v1/cloudron/restore', data, null, function (error, data, status) { diff --git a/src/js/restore.js b/src/js/restore.js index 93e17d4ee..d322accff 100644 --- a/src/js/restore.js +++ b/src/js/restore.js @@ -40,6 +40,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien $scope.password = ''; $scope.encrypted = false; // only used if a backup config contains that flag $scope.setupToken = ''; + $scope.skipDnsSetup = false; $scope.sysinfo = { provider: 'generic', @@ -274,7 +275,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien sysinfoConfig.ifname = $scope.sysinfo.ifname; } - Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, function (error) { + Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, $scope.skipDnsSetup, function (error) { $scope.busy = false; if (error) { diff --git a/src/restore.html b/src/restore.html index 6057df1d6..d48b86278 100644 --- a/src/restore.html +++ b/src/restore.html @@ -212,9 +212,18 @@ +
+ +
+ Use this option for testing your backups before migration. The DNS records are not updated and this browser's host must have an entry in /etc/hosts for the dashboard domain to this server's IP. +
+
+