Date: Sat, 26 Dec 2020 19:10:54 +0000 (UTC) From: Michael Reifenberger <mr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559304 - in head/security/bitwarden_rs: . files Message-ID: <202012261910.0BQJAsWK068810@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mr Date: Sat Dec 26 19:10:54 2020 New Revision: 559304 URL: https://svnweb.freebsd.org/changeset/ports/559304 Log: Try to fix pkg builder. Add sample environment config file. PR: 252129 # Used different approach. Added: head/security/bitwarden_rs/files/bitwarden_rs_conf.in (contents, props changed) head/security/bitwarden_rs/files/pkg-message.in (contents, props changed) Modified: head/security/bitwarden_rs/Makefile head/security/bitwarden_rs/pkg-plist Modified: head/security/bitwarden_rs/Makefile ============================================================================== --- head/security/bitwarden_rs/Makefile Sat Dec 26 18:43:15 2020 (r559303) +++ head/security/bitwarden_rs/Makefile Sat Dec 26 19:10:54 2020 (r559304) @@ -3,7 +3,7 @@ PORTNAME= bitwarden_rs DISTVERSION= 1.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web DISTFILES= ${WV_DISTFILE}:web @@ -23,6 +23,7 @@ USES= cargo ssl pgsql DISTVERSION_WV= 2.17.1 WV_DISTFILE= bw_web_v${DISTVERSION_WV}.tar.gz USE_RC_SUBR= ${PORTNAME} +SUB_FILES= pkg-message # make makeplist > pkg-plist #One has to edit/review the generated plist # make generate-plist && make check-plist @@ -376,10 +377,15 @@ CARGO_CRATES= addr2line-0.13.0 \ yubico-0.9.1 post-install: + ${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d + ${CP} ${FILESDIR}/bitwarden_rs_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample ${MKDIR} ${STAGEDIR}/${WWWDIR} ${MKDIR} ${STAGEDIR}/${WWWDIR}/data - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data + # ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data (cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR}) - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST} + # @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST} + ${ECHO_CMD} \ + '@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \ + >> ${TMPPLIST} .include <bsd.port.mk> Added: head/security/bitwarden_rs/files/bitwarden_rs_conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/bitwarden_rs/files/bitwarden_rs_conf.in Sat Dec 26 19:10:54 2020 (r559304) @@ -0,0 +1,36 @@ +ROCKET_ADDRESS=127.0.0.1 +export ROCKET_ADDRESS + +ROCKET_PORT=4567 # your port here +export ROCKET_PORT + +# ROCKET_TLS='{certs = "/ssl/fullchain.pem", key = "/ssl/key.pem"}' +# LOG_FILE='/data/bitwarden.log' + +SIGNUPS_ALLOWED='false' +export SIGNUPS_ALLOWED + +# DOMAIN='https://localhost.localdomain' +# export DOMAIN + +# ADMIN_TOKEN= # generate one with ~$ openssl rand -base64 48 +# export ADMIN_TOKEN + +SMTP_HOST=localhost +export SMTP_HOST + +SMTP_FROM=noreply@localhost +export SMTP_FROM + +SMTP_PORT=25 +export SMTP_PORT + +SMTP_SSL=false +export SMTP_SSL + +# SMTP_USERNAME= +# export SMTP_USERNAME + +# SMTP_PASSWORD= +# export SMTP_PASSWORD + Added: head/security/bitwarden_rs/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/bitwarden_rs/files/pkg-message.in Sat Dec 26 19:10:54 2020 (r559304) @@ -0,0 +1,13 @@ +[ +{ type: install + message: <<EOM + +Setup bitwarden_rs environment: + +Copy %%PREFIX%%/etc/rc.conf.d/bitwarden_rs.sample to %%PREFIX%%/etc/rc.conf.d/bitwarden_rs + +Adapt %%PREFIX%%/etc/rc.conf.d/bitwarden_rs to your needs. + +EOM +} +] Modified: head/security/bitwarden_rs/pkg-plist ============================================================================== --- head/security/bitwarden_rs/pkg-plist Sat Dec 26 18:43:15 2020 (r559303) +++ head/security/bitwarden_rs/pkg-plist Sat Dec 26 19:10:54 2020 (r559304) @@ -1,4 +1,6 @@ bin/bitwarden_rs +etc/rc.conf.d/bitwarden_rs.sample +etc/rc.d/bitwarden_rs %%WWWDIR%%/web-vault/.nojekyll %%WWWDIR%%/web-vault/app-id.json %%WWWDIR%%/web-vault/app/main.b96b42617884240af451.css @@ -115,4 +117,5 @@ bin/bitwarden_rs %%WWWDIR%%/web-vault/sso-connector.html %%WWWDIR%%/web-vault/u2f-connector.html %%WWWDIR%%/web-vault/version.json +@dir %%ETCDIR%%/rc.conf.d @dir %%WWWDIR%%/data
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012261910.0BQJAsWK068810>