Merge pull request 'Refactor Vaultwarden configuration to replace MariaDB with PostgreSQL, update related keys and paths, and remove unnecessary log directory.' (#35) from dev into main

Reviewed-on: #35
This commit is contained in:
2025-08-29 15:21:12 +00:00
4 changed files with 20 additions and 71 deletions

View File

@@ -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"
}
]
}

View File

@@ -15,44 +15,34 @@
"SOURCE": "USER_DATA", "SOURCE": "USER_DATA",
"DEST": "/etc/user/data", "DEST": "/etc/user/data",
"TYPE": "rw" "TYPE": "rw"
},
{
"SOURCE": "SYSTEM_LOG",
"DEST": "/etc/system/log",
"TYPE": "rw"
} }
], ],
"EXTRA": "--rm", "EXTRA": "--rm",
"DEPEND": "null", "DEPEND": "null",
"START_ON_BOOT": "false", "START_ON_BOOT": "false",
"ENTRYPOINT": "sh -c", "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", "PRE_START": "null",
"POST_START": "null" "POST_START": "null"
}, },
{ {
"IMAGE": "mariadb:latest", "IMAGE": "postgres:15-alpine",
"UPDATE": "true", "UPDATE": "true",
"NAME": "vaultwardenmysql-db", "NAME": "vaultwardenpostgres-db",
"MEMORY": "256M", "MEMORY": "256M",
"NETWORK": "vaultwarden-net", "NETWORK": "vaultwarden-net",
"SELECTOR": "vaultwardenmysql-db", "SELECTOR": "vaultwardenpostgres-db",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/etc/user/data/vaultwarden/db", "SOURCE": "/etc/user/data/vaultwarden/db",
"DEST": "/var/lib/mysql", "DEST": "/var/lib/postgres",
"TYPE": "rw"
},
{
"SOURCE": "/etc/system/log/vaultwarden/db",
"DEST": "/var/lib/mysql/mysql-bin",
"TYPE": "rw" "TYPE": "rw"
} }
], ],
"PORTS": [ "PORTS": [
{ {
"SOURCE": "null", "SOURCE": "null",
"DEST": "3306", "DEST": "5432",
"TYPE": "tcp" "TYPE": "tcp"
} }
], ],

View File

@@ -12,29 +12,29 @@
"required": "true" "required": "true"
}, },
{ {
"description": "MYSQL database name", "description": "Postgres database name",
"key": "MARIADB_DATABASE", "key": "POSTGRES_DB",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "" "generated": ""
}, },
{ {
"description": "MYSQL username", "description": "Postgres username",
"key": "MARIADB_USER", "key": "POSTGRES_USER",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "time|md5|8" "generated": "time|md5|8"
}, },
{ {
"description": "MYSQL password for user", "description": "Postgres password for user",
"key": "MARIADB_PASSWORD", "key": "POSTGRES_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|md5|12" "generated": "random|md5|12"
}, },
{ {
"description": "MYSQL root user password", "description": "Postgres root user password",
"key": "MARIADB_ROOT_PASSWORD", "key": "POSTGRES_ROOT_PASSWORD",
"value": "", "value": "",
"required": "true", "required": "true",
"generated": "random|sha256|20" "generated": "random|sha256|20"

View File

@@ -1,12 +1,12 @@
{ {
"vaultwardenmysql": { "vaultwardenpostgres": {
"MARIADB_DATABASE": "#MARIADB_DATABASE", "POSTGRES_DB": "#POSTGRES_DB",
"MARIADB_USER": "#MARIADB_USER", "POSTGRES_USER": "#POSTGRES_USER",
"MARIADB_PASSWORD": "#MARIADB_PASSWORD", "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
"MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD" "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
}, },
"vaultwardenapp": { "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", "ADMIN_TOKEN": "#ADMIN_TOKEN",
"VAULTWARDEN_DOMAIN": "#VAULTWARDEN_DOMAIN", "VAULTWARDEN_DOMAIN": "#VAULTWARDEN_DOMAIN",
"VAULTWARDEN_SMTP_PASSWORD": "#VAULTWARDEN_SMTP_PASSWORD" "VAULTWARDEN_SMTP_PASSWORD": "#VAULTWARDEN_SMTP_PASSWORD"