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

[Daniel M. Capella]

    Date: Friday, December 11, 2020 @ 01:18:53
  Author: polyzen
Revision: 773095

Add bitwarden_rs-web

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

-------------------------------------+
 -web/trunk/PKGBUILD                 |   43 ++++++++++++++++++++++++++++++++++
 -web/trunk/bitwarden_rs-web.install |   12 +++++++++
 trunk/PKGBUILD                      |    7 +++--
 3 files changed, 59 insertions(+), 3 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2020-12-10 23:38:55 UTC (rev 773094)
+++ trunk/PKGBUILD	2020-12-11 01:18:53 UTC (rev 773095)
@@ -4,7 +4,7 @@
 
 pkgname=bitwarden_rs
 pkgver=1.17.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Unofficial Bitwarden compatible server written in Rust'
 arch=('x86_64')
 url=https://github.com/dani-garcia/bitwarden_rs
@@ -11,7 +11,7 @@
 license=('GPL3')
 depends=('mariadb-libs' 'openssl' 'postgresql-libs' 'sqlite')
 makedepends=('rustup')
-optdepends=('bitwarden_rs-vault: for the web app')
+optdepends=('bitwarden_rs-web: for the web app')
 backup=('etc/bitwarden_rs.env')
 install=$pkgname.install
 source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
@@ -26,8 +26,9 @@
 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_ENABLED=true,WEB_VAULT_ENABLED=false,
-  s,# LOG_FILE=/path/to/log,# LOG_FILE=/var/log/bitwarden_rs.log,
+  s,/path/to/log,/var/log/bitwarden_rs.log,
   /^# ROCKET_TLS/a ROCKET_LIMITS={json=10485760}' .env.template
 }
 

Added: -web/trunk/PKGBUILD
===================================================================
--- -web/trunk/PKGBUILD	                        (rev 0)
+++ -web/trunk/PKGBUILD	2020-12-11 01:18:53 UTC (rev 773095)
@@ -0,0 +1,43 @@
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Markus Richter <mqus at disroot dot org>
+
+pkgname=bitwarden_rs-web
+pkgver=2.17.1
+pkgrel=1
+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
+license=('GPL3')
+depends=('bitwarden_rs')
+makedepends=('git' 'npm' 'python2')
+replaces=('bitwarden_rs-vault')
+install=$pkgname.install
+source=("bitwarden-web::git+https://github.com/bitwarden/web.git#tag=v$pkgver"
+        'git+https://github.com/bitwarden/jslib.git'
+        "$pkgname-v$pkgver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$pkgver/patches/v$pkgver.patch")
+b2sums=('SKIP'
+        'SKIP'
+        'da88c88d7a7bb034c3307992eb3a868928961c00bb44f4ad5b3adbf51c5858b365a0592c04071d8bf011911ec4cf69ae0f6bc8160bc07491b1e5f36c43d60dd9')
+
+prepare() {
+  cd bitwarden-web
+  git submodule init
+  git config submodule.jslib.url ../jslib
+  git submodule update
+  patch --forward --strip=1 --input=../$pkgname-v$pkgver.patch
+}
+
+build() {
+  cd bitwarden-web
+  npm install
+  npm audit fix
+  npm run dist
+}
+
+package() {
+  cd bitwarden-web
+  install -d "$pkgdir"/usr/share/$pkgname
+  cp -R build/* "$pkgdir"/usr/share/$pkgname
+}
+
+# vim:set ts=2 sw=2 et:

Added: -web/trunk/bitwarden_rs-web.install
===================================================================
--- -web/trunk/bitwarden_rs-web.install	                        (rev 0)
+++ -web/trunk/bitwarden_rs-web.install	2020-12-11 01:18:53 UTC (rev 773095)
@@ -0,0 +1,12 @@
+post_install() {
+  cat << EOF
+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
+}