summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2018-07-13 11:23:19 +0200
committerMarkus Richter2018-07-13 11:23:19 +0200
commitcb031ed9b0dfc358588b0b99d667d5fee444bcbe (patch)
treec2bc253e651433072d0f3e28c97eaaf85d108cff
parent8c475f21c75f5b51f4a1db7e036ffc5a8e4562f5 (diff)
downloadaur-cb031ed9b0dfc358588b0b99d667d5fee444bcbe.tar.gz
fixed user creation and possible shadow.service error messages
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--bitwarden_rs.install14
3 files changed, 13 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3bf8873bd21f..3cd0d703c5c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bitwarden_rs-vault-git
pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'.
- pkgver = r166.470ad14
+ pkgver = r169.2f892cb
pkgrel = 1
url = https://github.com/dani-garcia/bitwarden_rs
install = bitwarden_rs.install
@@ -29,7 +29,7 @@ pkgbase = bitwarden_rs-vault-git
sha512sums = 493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5
sha512sums = c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c
sha512sums = 5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a
- sha512sums = ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578
+ sha512sums = e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043
sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
pkgname = bitwarden_rs-vault-git
diff --git a/PKGBUILD b/PKGBUILD
index 60dade876f2f..c5e10d2396f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bitwarden_rs-vault-git
_pkgbase=bitwarden_rs
-pkgver=r166.470ad14
+pkgver=r169.2f892cb
_vaultver=1.27.0
pkgrel=1
pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'."
@@ -29,7 +29,7 @@ sha512sums=('SKIP'
'493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5'
'c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c'
'5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a'
- 'ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578'
+ 'e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043'
'773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6')
diff --git a/bitwarden_rs.install b/bitwarden_rs.install
index 3a6f11fe9511..2f6d1deb1c1f 100644
--- a/bitwarden_rs.install
+++ b/bitwarden_rs.install
@@ -2,13 +2,15 @@ post_install() {
# Create users and data directory
echo "Adding user bitwarden_rs and creating data directory /var/lib/bitwarden_rs ..."
- useradd -Ur -s /usr/bin/nologin bitwarden_rs
- mkdir -p /var/lib/bitwarden_rs -m 0750
+ mkdir -p /var/lib/bitwarden_rs
+ getent group bitwarden_rs &>/dev/null || groupadd -r bitwarden_rs >/dev/null
+ getent passwd bitwarden_rs &>/dev/null || useradd -r -g bitwarden_rs -d /var/lib/bitwarden_rs -s /usr/bin/nologin bitwarden_rs >/dev/null
chown bitwarden_rs:bitwarden_rs /var/lib/bitwarden_rs
- # Add service file
+ chmod 0750 /var/lib/bitwarden_rs
+
+ # Load service file
systemctl --quiet daemon-reload
-
echo "##########"
echo "# "
echo "# Remember to configure the server via its environment-variables under /etc/bitwarden_rs.env"
@@ -16,10 +18,10 @@ post_install() {
echo "#"
echo "##########"
-# systemctl --quiet preset bitwarden_rs.service
}
post_upgrade() {
+ #reload service file
systemctl --quiet daemon-reload
echo "##########"
echo "# "
@@ -30,10 +32,12 @@ post_upgrade() {
}
pre_remove() {
+ #stop service
systemctl --quiet --no-reload disable --now bitwarden_rs.service
}
post_remove() {
+ #unload service
systemctl --quiet daemon-reload
echo "##########"
echo "# "