git: c001d9d34931 - main - security/vaultwarden: Small quality of life improvements

[Michael Reifenberger]

The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c001d9d34931bf2f69637951b091626aac65ecf3

commit c001d9d34931bf2f69637951b091626aac65ecf3
Author:     Michael Reifenberger <mr at FreeBSD.org>
AuthorDate: 2021-05-18 16:43:44 +0000
Commit:     Michael Reifenberger <mr at FreeBSD.org>
CommitDate: 2021-05-18 16:43:44 +0000

    security/vaultwarden: Small quality of life improvements
    
    Put some additional notes into pkg-message.in and vaultwarden_conf.in
    
    PR:             255912
    Reported by:    Adrien freebsd at asdrip.fr
---
 security/vaultwarden/Makefile                  |  2 +-
 security/vaultwarden/files/pkg-message.in      | 13 +++++++++++++
 security/vaultwarden/files/vaultwarden_conf.in |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
index 9cee6c5d14f2..fd123de8e149 100644
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vaultwarden
 DISTVERSION=	1.21.0
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web
 DISTFILES=	${WV_DISTFILE}:web
diff --git a/security/vaultwarden/files/pkg-message.in b/security/vaultwarden/files/pkg-message.in
index 7cd41d1245ba..9c7b2671cf56 100644
--- a/security/vaultwarden/files/pkg-message.in
+++ b/security/vaultwarden/files/pkg-message.in
@@ -2,12 +2,25 @@
 { type: install
   message: <<EOM
 
+Note to former bitwarden_rs user to update from bitwarden_rs to vaulwarden : 
+
+Stop and disable bitwarden_rs service 
+
+Copy %%PREFIX%%/etc/rc.conf.d/bitwarden_rs to %%PREFIX%%/etc/rc.conf.d/vaultwarden
+
+Copy %%PREFIX%%/www/bitwarden_rs/data to %%PREFIX%%/www/vaultwarden/data
+
+Enable and start vaultwarden service
+
+---------------------------------------------------------------------------------------
+ 
 Setup vaultwarden environment:
 
 Copy %%PREFIX%%/etc/rc.conf.d/vaultwarden.sample to  %%PREFIX%%/etc/rc.conf.d/vaultwarden
 
 Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
 
+Enable and start vaultwarden service
 EOM
 }
 ]
diff --git a/security/vaultwarden/files/vaultwarden_conf.in b/security/vaultwarden/files/vaultwarden_conf.in
index 9e104aadd54c..c0890dae9029 100644
--- a/security/vaultwarden/files/vaultwarden_conf.in
+++ b/security/vaultwarden/files/vaultwarden_conf.in
@@ -1,3 +1,6 @@
+#Warning : Some of these settings may be overridden when changing settings on the admin page or in the config.json file
+#located by default at: /usr/local/www/vaulwarden/data/config.json
+
 ROCKET_ADDRESS=127.0.0.1
 export ROCKET_ADDRESS