[arch-commits] Commit in bitwarden_rs (3 files)

[Daniel M. Capella]

    Date: Tuesday, April 27, 2021 @ 11:49:40
  Author: polyzen
Revision: 924761

Use /usr/share/webapps for bitwarden_rs web app

Modified:
  bitwarden_rs-web/trunk/PKGBUILD
  bitwarden_rs-web/trunk/bitwarden_rs-web.install
  bitwarden_rs/trunk/PKGBUILD

-------------------------------------+
 -web/trunk/PKGBUILD                 |    6 +++---
 -web/trunk/bitwarden_rs-web.install |    3 ---
 trunk/PKGBUILD                      |    4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2021-04-27 11:28:53 UTC (rev 924760)
+++ trunk/PKGBUILD	2021-04-27 11:49:40 UTC (rev 924761)
@@ -4,7 +4,7 @@
 
 pkgname=bitwarden_rs
 pkgver=1.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Unofficial Bitwarden compatible server written in Rust'
 arch=('x86_64')
 url=https://github.com/dani-garcia/bitwarden_rs
@@ -26,7 +26,7 @@
 prepare() {
   cd $pkgname-$pkgver
   sed -i 's,# DATA_FOLDER=data,DATA_FOLDER=/var/lib/bitwarden_rs,
-  s,web-vault/,/usr/share/bitwarden_rs-web,
+  s,web-vault/,/usr/share/webapps/bitwarden_rs-web,
   s,# WEB_VAULT_ENABLED=true,WEB_VAULT_ENABLED=false,
   s,/path/to/log,/var/log/bitwarden_rs.log,
   /^# ROCKET_TLS/a ROCKET_LIMITS={json=10485760}' .env.template

Modified: -web/trunk/PKGBUILD
===================================================================
--- -web/trunk/PKGBUILD	2021-04-27 11:28:53 UTC (rev 924760)
+++ -web/trunk/PKGBUILD	2021-04-27 11:49:40 UTC (rev 924761)
@@ -6,7 +6,7 @@
 pkgver=2.19.0.b
 _upstreamver=2.19.0
 _patchver=2.19.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Bitwarden web vault with the patches to make it work with bitwarden_rs'
 arch=('any')
 url=https://github.com/dani-garcia/bw_web_builds
@@ -39,8 +39,8 @@
 
 package() {
   cd bitwarden-web
-  install -d "$pkgdir"/usr/share/$pkgname
-  cp -R build/* "$pkgdir"/usr/share/$pkgname
+  install -d "$pkgdir"/usr/share/webapps/$pkgname
+  cp -R build/* "$pkgdir"/usr/share/webapps/$pkgname
 }
 
 # vim:set ts=2 sw=2 et:

Modified: -web/trunk/bitwarden_rs-web.install
===================================================================
--- -web/trunk/bitwarden_rs-web.install	2021-04-27 11:28:53 UTC (rev 924760)
+++ -web/trunk/bitwarden_rs-web.install	2021-04-27 11:49:40 UTC (rev 924761)
@@ -3,9 +3,6 @@
 Uncomment WEB_VAULT_FOLDER and set WEB_VAULT_ENABLED to true in your
 /etc/bitwarden_rs.env.
 
-If upgrading from the AUR package, set the new path:
-WEB_VAULT_FOLDER=/usr/share/bitwarden_rs-web
-
 Restart bitwarden_rs after configuration changes have been made:
 # systemctl restart bitwarden_rs
 EOF