diff options
author | Markus Richter | 2018-07-13 20:09:39 +0200 |
---|---|---|
committer | Markus Richter | 2018-07-13 20:09:39 +0200 |
commit | e8f0862abbf736cc9baff85207317d76abc5f2bb (patch) | |
tree | 9a1c8af7ec4ae0cb5368cb9cc0e882a718ff6c10 | |
download | aur-e8f0862abbf736cc9baff85207317d76abc5f2bb.tar.gz |
initial release, v1.27.0 from upstream. copied relevant bits from bitwarden_rs-vault-git, which was a bundle of bitwarden_rs and vault
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | 0001-Change-Vault-Settings.patch | 14 | ||||
-rw-r--r-- | PKGBUILD | 43 | ||||
-rw-r--r-- | bitwarden_rs-vault.install | 47 |
4 files changed, 125 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..8a156052dcf8 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,21 @@ +pkgbase = bitwarden_rs-vault + pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs. + pkgver = 1.27.0 + pkgrel = 1 + url = https://github.com/bitwarden/web + install = bitwarden_rs-vault.install + arch = any + license = AGPL3 + makedepends = npm + depends = bitwarden_rs + conflicts = bitwarden_rs-vault-git + backup = etc/bitwarden_rs.env + source = https://github.com/bitwarden/web/archive/v1.27.0.tar.gz + source = 0001-Change-Vault-Settings.patch + source = bitwarden_rs-vault.install + sha512sums = 493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5 + sha512sums = c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c + sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1 + +pkgname = bitwarden_rs-vault + diff --git a/0001-Change-Vault-Settings.patch b/0001-Change-Vault-Settings.patch new file mode 100644 index 000000000000..145362c937a5 --- /dev/null +++ b/0001-Change-Vault-Settings.patch @@ -0,0 +1,14 @@ +--- settings.Production.json 2018-05-31 20:33:00.000000000 +0200 ++++ settings.Production.json 2018-07-11 23:39:12.479350252 +0200 +@@ -2,8 +2,8 @@ + "appSettings": { + "apiUri": "/api", + "identityUri": "/identity", +- "iconsUri": "https://icons.bitwarden.com", +- "stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk", +- "braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd" ++ "iconsUri": "/icons", ++ "stripeKey": "", ++ "braintreeKey": "" + } + } diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..29adf4174631 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Markus Richter <mqus at disroot dot org> + +pkgname=bitwarden_rs-vault +pkgver=1.27.0 +pkgrel=1 +pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs." +arch=('any') +url="https://github.com/bitwarden/web" +license=('AGPL3') +makedepends=('npm') +depends=('bitwarden_rs') +conflicts=("bitwarden_rs-vault-git") +backup=('etc/bitwarden_rs.env') +install=bitwarden_rs-vault.install +source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz" + "0001-Change-Vault-Settings.patch" + "$pkgname.install") +sha512sums=('493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5' + 'c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c' + '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1') + + +prepare() { + #follow https://github.com/dani-garcia/bitwarden_rs/blob/master/BUILD.md AND remove the package-lock to fix gulp execution (see https://github.com/gulpjs/gulp/issues/2162 ) + cd "$srcdir/web-$pkgver" + #fix gulp install + rm package-lock.json + #patch all + patch -N -i "$srcdir/0001-Change-Vault-Settings.patch" +} + +build() { + #build vault webinterface + cd "$srcdir/web-$pkgver" + npm install + npx gulp dist:selfHosted +} + +package() { + # install vault files + install -d "$pkgdir/usr/share/bitwarden_rs" + cp -r "$srcdir/web-$pkgver/dist" "$pkgdir/usr/share/bitwarden_rs/vault" +} diff --git a/bitwarden_rs-vault.install b/bitwarden_rs-vault.install new file mode 100644 index 000000000000..199636f66a27 --- /dev/null +++ b/bitwarden_rs-vault.install @@ -0,0 +1,47 @@ +post_install() { + # Patch config to make bitwarden_rs aware of vault + echo "Trying to automatically reconfigure bitwarden_rs by patching /etc/bitwarden_rs.env ..." + echo '--- /etc/bitwarden_rs.env 2018-07-12 12:10:14.679534090 +0200 ++++ /etc/bitwarden_rs.env 2018-07-12 12:21:34.165391938 +0200 +@@ -13,4 +13,4 @@ + ## Web vault settings +-# WEB_VAULT_FOLDER=web-vault/ ++WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/ +-WEB_VAULT_ENABLED=false ++# WEB_VAULT_ENABLED=true + +'|patch /etc/bitwarden_rs.env >/dev/null + + if [ $? -eq 0 ]; then + echo "Reconfiguring successful!, please restart bitwarden_rs.service!" + else + echo "Patching failed. Please insert the following two lines into /etc/bitwarden_rs.env (make sure that DOMAIN is (un)set correctly) and restart bitwarden_rs.service" + echo "WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/" + echo "WEB_VAULT_ENABLED=true" + fi + +} + + +post_remove() { + # Patch config to disable vault + echo "Trying to automatically reconfigure bitwarden_rs by patching /etc/bitwarden_rs.env ..." + echo '--- /etc/bitwarden_rs.env 2018-07-12 12:10:14.679534090 +0200 ++++ /etc/bitwarden_rs.env 2018-07-12 12:21:34.165391938 +0200 +@@ -13,4 +13,4 @@ + ## Web vault settings +-WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/ ++# WEB_VAULT_FOLDER=web-vault/ +-# WEB_VAULT_ENABLED=true ++WEB_VAULT_ENABLED=false + +'|patch /etc/bitwarden_rs.env >/dev/null + + if [ $? -eq 0 ]; then + echo "Reconfiguring successful!, please restart bitwarden_rs.service!" + else + echo "Patching failed. Please change /etc/bitwarden_rs.env to include the following two lines and restart bitwarden_rs.service" + echo "# WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/" + echo "WEB_VAULT_ENABLED=false" + fi +} |