Page MenuHomeFreeBSD
Files F147829153

D41602.diff
No OneTemporary
Actions

D41602.diff
View Options

diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -22,6 +22,10 @@
GH_ACCOUNT= dani-garcia
USE_RC_SUBR= ${PORTNAME}
+USERS= ${WWWOWN}
+GROUPS= ${WWWGRP}
+PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+
OPTIONS_DEFINE= WEBVAULT
OPTIONS_DEFAULT=WEBVAULT
@@ -36,7 +40,6 @@
INSTALL_TARGET= install-strip
-SUB_FILES= pkg-message
SUB_LIST= WWWGRP=${WWWGRP} \
WWWOWN=${WWWOWN}
@@ -45,11 +48,7 @@
# ${WRKSRC}/Cargo.toml
post-install:
- ${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
- ${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
${MKDIR} ${STAGEDIR}/${WWWDIR}/data
- ${ECHO_CMD} \
- '@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
- >> ${TMPPLIST}
+ ${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${WWWDIR}/data/config.json.sample
.include <bsd.port.mk>
diff --git a/security/vaultwarden/files/pkg-message.in b/security/vaultwarden/files/pkg-message.in
deleted file mode 100644
--- a/security/vaultwarden/files/pkg-message.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-{ type: install
- message: <<EOM
-
-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/pkg-plist b/security/vaultwarden/pkg-plist
--- a/security/vaultwarden/pkg-plist
+++ b/security/vaultwarden/pkg-plist
@@ -1,4 +1,3 @@
bin/vaultwarden
-etc/rc.conf.d/vaultwarden.sample
-@dir %%ETCDIR%%/rc.conf.d
-@dir %%WWWDIR%%/data
+@dir(%%WWWOWN%%,%%WWWGRP%%,0755) %%WWWDIR%%/data
+@sample %%WWWDIR%%/data/config.json.sample

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 15, 12:03 AM (1 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29693407
Default Alt Text
D41602.diff (1 KB)

Event Timeline