merge backupdb into backups.js

src/provision.js

@@ -10,6 +10,7 @@ exports = module.exports = {
 const assert = require('assert'),
     async = require('async'),
     backups = require('./backups.js'),
+    backuptask = require('./backuptask.js'),
     BoxError = require('./boxerror.js'),
     branding = require('./branding.js'),
     constants = require('./constants.js'),
@@ -184,7 +185,7 @@ function restore(backupConfig, backupId, version, sysinfoConfig, options, auditS
         if (error) return done(error);
         if (activated) return done(new BoxError(BoxError.CONFLICT, 'Already activated. Restore with a fresh Cloudron installation.'));
 
-        if (backups.isMountProvider(backupConfig.provider)) {
+        if (mounts.isMountProvider(backupConfig.provider)) {
             error = mounts.validateMountOptions(backupConfig.provider, backupConfig.mountOptions);
             if (error) return done(error);
 
@@ -218,7 +219,7 @@ function restore(backupConfig, backupId, version, sysinfoConfig, options, auditS
 
                 async.series([
                     setProgress.bind(null, 'restore', 'Downloading backup'),
-                    backups.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
+                    backuptask.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
                     settings.setSysinfoConfig.bind(null, sysinfoConfig),
                     reverseProxy.restoreFallbackCertificates,
                     (done) => {