From f076e8114dd37602a32dca7fa6fa300b5ad895b4 Mon Sep 17 00:00:00 2001
From: Kayou <pierre@kayou.io>
Date: Tue, 16 Jul 2024 16:36:43 +0200
Subject: [PATCH] YunoHost-specific section to simplify configuration file
 updates

---
 conf/vaultwarden.env | 63 +++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/conf/vaultwarden.env b/conf/vaultwarden.env
index ff3dca2..8497597 100644
--- a/conf/vaultwarden.env
+++ b/conf/vaultwarden.env
@@ -15,7 +15,7 @@
 ####################
 
 ## Main data folder
-DATA_FOLDER=__DATA_DIR__
+# DATA_FOLDER=data
 
 ## Individual folders, these override %DATA_FOLDER%
 # RSA_KEY_FILENAME=data/rsa_key
@@ -31,8 +31,8 @@ DATA_FOLDER=__DATA_DIR__
 # RELOAD_TEMPLATES=false
 
 ## Web vault settings
-WEB_VAULT_FOLDER=web-vault/
-WEB_VAULT_ENABLED=true
+# WEB_VAULT_FOLDER=web-vault/
+# WEB_VAULT_ENABLED=true
 
 #########################
 ### Database settings ###
@@ -174,7 +174,6 @@ WEB_VAULT_ENABLED=true
 # DOMAIN=https://vw.domain.tld:8443
 ## For public server (URL with path)
 # DOMAIN=https://domain.tld/vw
-DOMAIN=https://__DOMAIN____PATH__
 
 ## Controls whether users are allowed to create Bitwarden Sends.
 ## This setting applies globally to all users.
@@ -218,7 +217,7 @@ DOMAIN=https://__DOMAIN____PATH__
 # DISABLE_ICON_DOWNLOAD=false
 
 ## Controls if new users can register
-SIGNUPS_ALLOWED=false
+# SIGNUPS_ALLOWED=true
 
 ## Controls if new users need to verify their email address upon registration
 ## Note that setting this option to true prevents logins until the email address has been verified!
@@ -358,7 +357,7 @@ SIGNUPS_ALLOWED=false
 # USE_SYSLOG=false
 
 ## Logging to file
-LOG_FILE=/var/log/__APP__/__APP__.log
+# LOG_FILE=/path/to/log
 
 ## Log level
 ## Change the verbosity of the log output
@@ -376,7 +375,7 @@ LOG_FILE=/var/log/__APP__/__APP__.log
 ## Also, use single quotes (') instead of double quotes (") to enclose the string when needed
 # ADMIN_TOKEN='$argon2id$v=19$m=65540,t=3,p=4$MmeKRnGK5RW5mJS7h3TOL89GrpLPXJPAtTK8FTqj9HM$DqsstvoSAETl9YhnsXbf43WeaUwJC6JhViIvuPoig78'
 ## Old plain text string (Will generate warnings in favor of Argon2)
-ADMIN_TOKEN=__ADMIN_TOKEN__
+# ADMIN_TOKEN=Vy2VyYTTsKPv8W5aEOWUbB/Bt3DEKePbHmI4m9VcemUMS2rEviDowNAFqYi1xjmp
 
 ## Enable this to bypass the admin panel security. This option is only
 ## meant to be used with the use of a separate auth layer in front
@@ -476,11 +475,11 @@ ADMIN_TOKEN=__ADMIN_TOKEN__
 ## Mail specific settings, set SMTP_FROM and either SMTP_HOST or USE_SENDMAIL to enable the mail service.
 ## To make sure the email links are pointing to the correct host, set the DOMAIN variable.
 ## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory
-SMTP_HOST=__DOMAIN__
-SMTP_FROM=__APP__@__DOMAIN__
-SMTP_FROM_NAME=Vaultwarden
-SMTP_USERNAME=__APP__
-SMTP_PASSWORD=__MAIL_PWD__
+# SMTP_HOST=smtp.domain.tld
+# SMTP_FROM=vaultwarden@domain.tld
+# SMTP_FROM_NAME=Vaultwarden
+# SMTP_USERNAME=username
+# SMTP_PASSWORD=password
 # SMTP_TIMEOUT=15
 
 ## Choose the type of secure connection for SMTP. The default is "starttls".
@@ -489,8 +488,8 @@ SMTP_PASSWORD=__MAIL_PWD__
 ## - "force_tls": The default port is 465.
 ## - "off": The default port is 25.
 ## Ports 587 (submission) and 25 (smtp) are standard without encryption and with encryption via STARTTLS (Explicit TLS). Port 465 (submissions) is used for encrypted submission (Implicit TLS).
-SMTP_SECURITY=starttls
-SMTP_PORT=25
+# SMTP_SECURITY=starttls
+# SMTP_PORT=587
 
 # Whether to send mail via the `sendmail` command
 # USE_SENDMAIL=false
@@ -532,11 +531,39 @@ SMTP_PORT=25
 
 ## Rocket specific settings
 ## See https://rocket.rs/v0.5/guide/configuration/ for more details.
-ROCKET_ADDRESS=127.0.0.1
+# ROCKET_ADDRESS=0.0.0.0
 ## The default port is 8000, unless running in a Docker container, in which case it is 80.
-ROCKET_PORT=__PORT_ROCKET__
-ROCKET_WORKERS=1
+# ROCKET_PORT=8000
 # ROCKET_TLS={certs="/path/to/certs.pem",key="/path/to/key.pem"}
 
+#######################################
+### YunoHost Specific Configuration ###
+#######################################
 
-# vim: syntax=ini
+DATA_FOLDER=__DATA_DIR__
+
+WEB_VAULT_FOLDER=web-vault/
+WEB_VAULT_ENABLED=true
+
+DOMAIN=https://__DOMAIN____PATH__
+
+SIGNUPS_ALLOWED=false
+
+LOG_FILE=/var/log/__APP__/__APP__.log
+
+ADMIN_TOKEN=__ADMIN_TOKEN__
+
+SMTP_HOST=__DOMAIN__
+SMTP_FROM=__APP__@__DOMAIN__
+SMTP_FROM_NAME=Vaultwarden
+SMTP_USERNAME=__APP__
+SMTP_PASSWORD=__MAIL_PWD__
+
+SMTP_SECURITY=starttls
+SMTP_PORT=25
+
+ROCKET_ADDRESS=127.0.0.1
+ROCKET_PORT=__PORT_ROCKET__
+ROCKET_WORKERS=1
+
+# vim: syntax=ini
\ No newline at end of file