@saltcorn/server 1.3.0-beta.0 → 1.3.0-beta.2

package/routes/admin.js

@@ -487,6 +487,18 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
+    backupForm.values.backup_s3_bucket =
+      getState().getConfig("backup_s3_bucket");
+    backupForm.values.backup_s3_endpoint =
+      getState().getConfig("backup_s3_endpoint");
+    backupForm.values.backup_s3_access_key = getState().getConfig(
+      "backup_s3_access_key"
+    );
+    backupForm.values.backup_s3_access_secret = getState().getConfig(
+      "backup_s3_access_secret"
+    );
+    backupForm.values.backup_s3_region =
+      getState().getConfig("backup_s3_region");
     aBackupFilePrefixForm.values.backup_with_event_log = getState().getConfig(
       "backup_with_event_log"
     );
@@ -1014,7 +1026,7 @@ const autoBackupForm = (req) => {
         showIf: { auto_backup_frequency: ["Daily", "Weekly"] },
         attributes: {
           auto_backup_frequency: ["Daily", "Weekly"],
-          options: ["Saltcorn files", "Local directory", "SFTP server"],
+          options: ["Saltcorn files", "Local directory", "SFTP server", "S3"],
         },
       },
       {
@@ -1077,18 +1089,6 @@ const autoBackupForm = (req) => {
           //auto_backup_destination: "Local directory",
         },
       },
-      {
-        type: "Integer",
-        label: req.__("Expiration in days"),
-        sublabel: req.__(
-          "Delete old backup files in this directory after the set number of days"
-        ),
-        name: "auto_backup_expire_days",
-        showIf: {
-          auto_backup_frequency: ["Daily", "Weekly"],
-          auto_backup_destination: "Local directory",
-        },
-      },
       ...(isRoot
         ? [
             {
@@ -1102,6 +1102,64 @@ const autoBackupForm = (req) => {
             },
           ]
         : []),
+      {
+        type: "String",
+        label: req.__("S3 Endpoint"),
+        name: "backup_s3_endpoint",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("S3 Bucket Name"),
+        name: "backup_s3_bucket",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("S3 Access Key"),
+        name: "backup_s3_access_key",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("S3 Secret Key"),
+        fieldview: "password",
+        name: "backup_s3_access_secret",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("S3 Region"),
+        name: "backup_s3_region",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "S3",
+        },
+      },
+      {
+        type: "Integer",
+        label: req.__("Expiration in days"),
+        sublabel: req.__(
+          "Delete old backup files in this directory after the set number of days"
+        ),
+        name: "auto_backup_expire_days",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: ["Local directory", "S3"],
+        },
+      },
     ],
   });
 };

package/s3storage.js

@@ -12,7 +12,7 @@ function createS3Client() {
       secretAccessKey: getState().getConfig("storage_s3_access_secret"),
       accessKeyId: getState().getConfig("storage_s3_access_key"),
     },
-    region: getState().getConfig("storage_s3_region"),
+    region: getState().getConfig("storage_s3_region") || "us-east-1",
     endpoint: getState().getConfig("storage_s3_endpoint"),
   });
 }