Merge pull request #32 from Start9Labs/feat/new-backup

chore: Use the latest backup.

.gitignore

@@ -3,4 +3,5 @@ vaultwarden.s9pk
 scripts/*.js
 scripts/generated/manifest.ts
 .vscode/
-docker-images
+docker-images
+vaultwarden/

manifest.json

@@ -1,17 +1,15 @@
 {
   "id": "vaultwarden",
   "title": "Vaultwarden",
-  "version": "1.27.0",
-  "release-notes": "* Update upstream to v1.27.0, official release notes: https://github.com/dani-garcia/vaultwarden/releases/tag/1.27.0 \n * Fix a bug with client connections",
+  "version": "1.27.0.1",
+  "release-notes": "* Use new eOS APIs for backups",
   "license": "GPL-3.0",
   "wrapper-repo": "https://github.com/Start9Labs/vaultwarden-wrapper",
   "upstream-repo": "https://github.com/dani-garcia/vaultwarden",
   "support-site": "https://vaultwarden.discourse.group/",
   "marketing-site": "https://github.com/dani-garcia/vaultwarden/",
   "donation-url": "https://www.paypal.com/paypalme/DaniGG",
-  "build": [
-    "make"
-  ],
+  "build": ["make"],
   "description": {
     "short": "Secure password management",
     "long": "Vaultwarden is a lightweight and secure password manager for storing and auto-filling sensitive information such as usernames and passwords, credit cards, identities, and notes. It is an alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients. All data is stored in an encrypted vault on your Embassy.\n"
@@ -77,64 +75,29 @@
         }
       },
       "ui": true,
-      "protocols": [
-        "tcp",
-        "http"
-      ]
+      "protocols": ["tcp", "http"]
     }
   },
   "backup": {
     "create": {
-      "type": "docker",
-      "image": "compat",
-      "system": true,
-      "entrypoint": "compat",
-      "args": [
-        "duplicity",
-        "create",
-        "/mnt/backup",
-        "/data"
-      ],
-      "mounts": {
-        "BACKUP": "/mnt/backup",
-        "main": "/data"
-      },
-      "io-format": "yaml"
+      "type": "script"
     },
     "restore": {
-      "type": "docker",
-      "image": "compat",
-      "system": true,
-      "entrypoint": "compat",
-      "args": [
-        "duplicity",
-        "restore",
-        "/mnt/backup",
-        "/data"
-      ],
-      "mounts": {
-        "BACKUP": "/mnt/backup",
-        "main": "/data"
-      },
-      "io-format": "yaml"
+      "type": "script"
     }
   },
   "migrations": {
     "from": {
       "*": {
         "type": "script",
-        "args": [
-          "from"
-        ]
+        "args": ["from"]
       }
     },
     "to": {
       "*": {
         "type": "script",
-        "args": [
-          "to"
-        ]
+        "args": ["to"]
       }
     }
   }
-}
+}

scripts/deps.ts

@@ -1,2 +1,2 @@
-export * from "https://deno.land/x/[email protected].4/mod.ts";
-export * from "https://deno.land/x/[email protected].4/healthUtil.ts";
+export * from "https://deno.land/x/[email protected].7/mod.ts";
+export * from "https://deno.land/x/[email protected].7/healthUtil.ts";

scripts/embassy.ts

@@ -2,5 +2,5 @@ export { setConfig } from "./procedures/setConfig.ts";
 export { getConfig } from "./procedures/getConfig.ts";
 export { health } from "./procedures/health.ts";
 export { properties } from "./procedures/properties.ts";
-
-export { migration } from "./procedures/migrations.ts";
+export { createBackup, restoreBackup } from "./procedures/backups.ts";
+export { migration } from "./procedures/migrations.ts";

scripts/procedures/backups.ts

@@ -0,0 +1,3 @@
+import { Backups } from "../deps.ts";
+
+export const { createBackup, restoreBackup } = Backups.volumes("main").build();

scripts/procedures/migrations.ts

@@ -4,6 +4,7 @@ import { manifest } from "../generated/manifest.ts";
 export const migration: T.ExpectedExports.migration = migrations.fromMapping(
   {
     // 1.22.2 No migration needed
+    // 1.30.0 No migration needed
   },
   manifest.version,
 );