From 3f73d1e42d8af025a3a1bf62be46b862e28dfdd1 Mon Sep 17 00:00:00 2001
From: gyurix <gyurix@gmail.com>
Date: Fri, 29 Aug 2025 17:20:14 +0200
Subject: [PATCH] Refactor Vaultwarden configuration to replace MariaDB with
 PostgreSQL, update related keys and paths, and remove unnecessary log
 directory.

---
 roundcube/template.json              | 41 ----------------------------
 vaultwarden/service-vaultwarden.json | 22 ++++-----------
 vaultwarden/template.json            | 16 +++++------
 vaultwarden/vaultwarden-secret.json  | 12 ++++----
 4 files changed, 20 insertions(+), 71 deletions(-)
 delete mode 100644 roundcube/template.json

diff --git a/roundcube/template.json b/roundcube/template.json
deleted file mode 100644
index 9e4ea65..0000000
--- a/roundcube/template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-        "name": "roundcube",
-        "fields": [
-                {
-                        "description": "Please add IMAP HOST:",
-                        "key": "ROUNDCUBE_IMAP_HOST",
-                        "value": "",
-                        "required": "true"
-                },
-                {
-                        "description": "Please add IMAP PORT:",
-                        "key": "ROUNDCUBE_IMAP_PORT",
-                        "value": "143",
-                        "required": "true"
-                },
-                {
-                        "description": "Please add SMTP HOST:",
-                        "key": "ROUNDCUBE_SMTP_HOST",
-                        "value": "",
-                        "required": "true"
-                },
-                {
-                        "description": "Please add SMTP PORT (587, 465, 25, etc.):",
-                        "key": "ROUNDCUBE_SMTP_PORT",
-                        "value": "25",
-                        "required": "true"
-                },
-                {
-                        "description": "Please add UPLOAD_MAX_FILESIZE (default: 50M):",
-                        "key": "ROUNDCUBE_UPLOAD",
-                        "value": "50M",
-                        "required": "true"
-                },
-                {
-                        "description": "Please add Roundcube DOMAIN:",
-                        "key": "ROUNDCUBE_DOMAIN",
-                        "value": "",
-                        "required": "true"
-                }
-        ]
-}
diff --git a/vaultwarden/service-vaultwarden.json b/vaultwarden/service-vaultwarden.json
index eaef5d0..33d89cb 100644
--- a/vaultwarden/service-vaultwarden.json
+++ b/vaultwarden/service-vaultwarden.json
@@ -15,44 +15,34 @@
                     "SOURCE": "USER_DATA",
                     "DEST": "/etc/user/data",
                     "TYPE": "rw"
-                },
-                {
-                    "SOURCE": "SYSTEM_LOG",
-                    "DEST": "/etc/system/log",
-                    "TYPE": "rw"
                 }
             ],
             "EXTRA": "--rm",
             "DEPEND": "null",
             "START_ON_BOOT": "false",
             "ENTRYPOINT": "sh -c",
-            "CMD": "mkdir -p /etc/user/data/vaultwarden/data && mkdir -p /etc/user/data/vaultwarden/db && mkdir -p /etc/system/log/vaultwarden/db",
+            "CMD": "mkdir -p /etc/user/data/vaultwarden/data && mkdir -p /etc/user/data/vaultwarden/db",
             "PRE_START": "null",
             "POST_START": "null"
         },
         {
-            "IMAGE": "mariadb:latest",
+            "IMAGE": "postgres:15-alpine",
             "UPDATE": "true",
-            "NAME": "vaultwardenmysql-db",
+            "NAME": "vaultwardenpostgres-db",
             "MEMORY": "256M",
             "NETWORK": "vaultwarden-net",
-            "SELECTOR": "vaultwardenmysql-db",
+            "SELECTOR": "vaultwardenpostgres-db",
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/vaultwarden/db",
-                    "DEST": "/var/lib/mysql",
-                    "TYPE": "rw"
-                },
-                {
-                    "SOURCE": "/etc/system/log/vaultwarden/db",
-                    "DEST": "/var/lib/mysql/mysql-bin",
+                    "DEST": "/var/lib/postgres",
                     "TYPE": "rw"
                 }
             ],
             "PORTS": [
                 {
                     "SOURCE": "null",
-                    "DEST": "3306",
+                    "DEST": "5432",
                     "TYPE": "tcp"
                 }
             ],
diff --git a/vaultwarden/template.json b/vaultwarden/template.json
index b663dfa..5d47a7a 100644
--- a/vaultwarden/template.json
+++ b/vaultwarden/template.json
@@ -12,29 +12,29 @@
             "required": "true"
         },
         {
-            "description": "MYSQL database name",
-            "key": "MARIADB_DATABASE",
+            "description": "Postgres database name",
+            "key": "POSTGRES_DB",
             "value": "",
             "required": "true",
             "generated": ""
         },
         {
-            "description": "MYSQL username",
-            "key": "MARIADB_USER",
+            "description": "Postgres username",
+            "key": "POSTGRES_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
-            "description": "MYSQL password for user",
-            "key": "MARIADB_PASSWORD",
+            "description": "Postgres password for user",
+            "key": "POSTGRES_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
-            "description": "MYSQL root user password",
-            "key": "MARIADB_ROOT_PASSWORD",
+            "description": "Postgres root user password",
+            "key": "POSTGRES_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"
diff --git a/vaultwarden/vaultwarden-secret.json b/vaultwarden/vaultwarden-secret.json
index 413358b..eca4e59 100644
--- a/vaultwarden/vaultwarden-secret.json
+++ b/vaultwarden/vaultwarden-secret.json
@@ -1,12 +1,12 @@
 {
-    "vaultwardenmysql": {
-        "MARIADB_DATABASE": "#MARIADB_DATABASE",
-        "MARIADB_USER": "#MARIADB_USER",
-        "MARIADB_PASSWORD": "#MARIADB_PASSWORD",
-        "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD"
+    "vaultwardenpostgres": {
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "vaultwardenapp": {
-        "DATABASE_URL": "'mysql://#MARIADB_USER:#MARIADB_PASSWORD@vaultwardenmysql-db:3306/#MARIADB_DATABASE'",
+        "DATABASE_URL": "'postgresql://#POSTGRES_USER:#POSTGRES_PASSWORD@vaultwardenpostgres-db:5432/#POSTGRES_DB'",
         "ADMIN_TOKEN": "#ADMIN_TOKEN",
         "VAULTWARDEN_DOMAIN": "#VAULTWARDEN_DOMAIN",
         "VAULTWARDEN_SMTP_PASSWORD": "#VAULTWARDEN_SMTP_PASSWORD"