commit:     56075f81a712bef841dd47d2b48d44a8e0e143b6
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Mon Feb 26 17:40:15 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Feb 26 20:24:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56075f81

app-admin/vaultwarden: print instructions only on first install

also add symlink  /etc/conf.d/vaultwarden -> ../vaultwarden.env for
openrc users to find config at usual location

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>

 app-admin/vaultwarden/vaultwarden-1.30.3.ebuild | 20 ++++++++++++++------
 app-admin/vaultwarden/vaultwarden-9999.ebuild   | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild 
b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
index 4cf733e1aa..27fdd5ac6d 100644
--- a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo check-reqs systemd tmpfiles
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Unofficial Bitwarden compatible password manager server written 
in Rust"
 HOMEPAGE="https://github.com/dani-garcia/vaultwarden";
@@ -53,6 +53,16 @@ PATCHES=(
 CHECKREQS_MEMORY=3G
 CHECKREQS_DISK_BUILD=2G
 
+DOC_CONTENTS="\n
+       Configuration file: /etc/${PN}.env\n
+       Data directory: /var/lib/${PN}\n
+       \n
+       MySQL & PostgreSQL users must set DATABASE_URL in config\n
+       \n
+       Default server: http://0.0.0.0:8000\n
+       Admin interface: http://0.0.0.0:8000/admin
+"
+
 src_unpack() {
        if [[ ${PV} == 9999* ]]; then
                # clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
        newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
        insinto /etc
        newins .env.template "${PN}".env
+       dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
        keepdir /var/lib/"${PN}"
 
+       readme.gentoo_create_doc
        einstalldocs
        dodoc -r ../"${PN}".wiki/*
 }
 
 pkg_postinst() {
        tmpfiles_process "${PN}".conf
-       elog "Configuration file: /etc/${PN}.env"
-       elog "Data directory: /var/lib/${PN}"
-       use mysql || use postgres && elog "User must set DATABASE_URL in config 
"
-       elog "Default server: http://127.0.0.1:8000";
-       elog "Admin interface: http://127.0.0.1:8000/admin";
+       readme.gentoo_print_elog
 }

diff --git a/app-admin/vaultwarden/vaultwarden-9999.ebuild 
b/app-admin/vaultwarden/vaultwarden-9999.ebuild
index 4cf733e1aa..27fdd5ac6d 100644
--- a/app-admin/vaultwarden/vaultwarden-9999.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo check-reqs systemd tmpfiles
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
 
 DESCRIPTION="Unofficial Bitwarden compatible password manager server written 
in Rust"
 HOMEPAGE="https://github.com/dani-garcia/vaultwarden";
@@ -53,6 +53,16 @@ PATCHES=(
 CHECKREQS_MEMORY=3G
 CHECKREQS_DISK_BUILD=2G
 
+DOC_CONTENTS="\n
+       Configuration file: /etc/${PN}.env\n
+       Data directory: /var/lib/${PN}\n
+       \n
+       MySQL & PostgreSQL users must set DATABASE_URL in config\n
+       \n
+       Default server: http://0.0.0.0:8000\n
+       Admin interface: http://0.0.0.0:8000/admin
+"
+
 src_unpack() {
        if [[ ${PV} == 9999* ]]; then
                # clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
        newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
        insinto /etc
        newins .env.template "${PN}".env
+       dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
        keepdir /var/lib/"${PN}"
 
+       readme.gentoo_create_doc
        einstalldocs
        dodoc -r ../"${PN}".wiki/*
 }
 
 pkg_postinst() {
        tmpfiles_process "${PN}".conf
-       elog "Configuration file: /etc/${PN}.env"
-       elog "Data directory: /var/lib/${PN}"
-       use mysql || use postgres && elog "User must set DATABASE_URL in config 
"
-       elog "Default server: http://127.0.0.1:8000";
-       elog "Admin interface: http://127.0.0.1:8000/admin";
+       readme.gentoo_print_elog
 }

Reply via email to