[arch-commits] Commit in vaultwarden/repos/community-x86_64 (10 files)
Daniel M. Capella
polyzen at archlinux.org
Tue May 4 00:59:58 UTC 2021
Date: Tuesday, May 4, 2021 @ 00:59:58
Author: polyzen
Revision: 927332
archrelease: copy trunk to community-x86_64
Added:
vaultwarden/repos/community-x86_64/PKGBUILD
(from rev 927331, vaultwarden/trunk/PKGBUILD)
vaultwarden/repos/community-x86_64/vaultwarden.install
(from rev 927331, vaultwarden/trunk/vaultwarden.install)
vaultwarden/repos/community-x86_64/vaultwarden.service
(from rev 927331, vaultwarden/trunk/vaultwarden.service)
vaultwarden/repos/community-x86_64/vaultwarden.sysusers.conf
(from rev 927331, vaultwarden/trunk/vaultwarden.sysusers.conf)
vaultwarden/repos/community-x86_64/vaultwarden.tmpfiles
(from rev 927331, vaultwarden/trunk/vaultwarden.tmpfiles)
Deleted:
vaultwarden/repos/community-x86_64/PKGBUILD
vaultwarden/repos/community-x86_64/bitwarden_rs.install
vaultwarden/repos/community-x86_64/bitwarden_rs.service
vaultwarden/repos/community-x86_64/bitwarden_rs.sysusers.conf
vaultwarden/repos/community-x86_64/bitwarden_rs.tmpfiles
----------------------------+
PKGBUILD | 112 +++++++++++++++++++++----------------------
bitwarden_rs.install | 24 ---------
bitwarden_rs.service | 55 ---------------------
bitwarden_rs.sysusers.conf | 1
bitwarden_rs.tmpfiles | 3 -
vaultwarden.install | 32 ++++++++++++
vaultwarden.service | 55 +++++++++++++++++++++
vaultwarden.sysusers.conf | 1
vaultwarden.tmpfiles | 3 +
9 files changed, 148 insertions(+), 138 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-04 00:59:11 UTC (rev 927331)
+++ PKGBUILD 2021-05-04 00:59:58 UTC (rev 927332)
@@ -1,55 +0,0 @@
-# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
-# Contributor: Markus Richter <mqus at disroot dot org>
-# Contributor: Timothée Ravier <tim at siosm.fr
-
-pkgname=bitwarden_rs
-pkgver=1.20.0
-pkgrel=2
-pkgdesc='Unofficial Bitwarden compatible server written in Rust'
-arch=('x86_64')
-url=https://github.com/dani-garcia/bitwarden_rs
-license=('GPL3')
-depends=('mariadb-libs' 'openssl' 'postgresql-libs' 'sqlite')
-makedepends=('rustup')
-optdepends=('bitwarden_rs-web: for the web app')
-backup=('etc/bitwarden_rs.env')
-install=$pkgname.install
-source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
- "$pkgname.service"
- "$pkgname.sysusers.conf"
- "$pkgname.tmpfiles")
-b2sums=('22dccda4e0227df6726c74180dd3f6bf7cff0ef456c371d79f9f58c76398c7d61df72b0dad1bdd02d7411eb2ec2a91e7c7ae655c43786da6498c8485ca1a7d6b'
- '22bc90b8c49b6a26610ec840f04481fe3c7fcffc82434df3ee6adba4555787ba44c7b58dfcb181a28d4a6c943db6e7f7f439b67995c5aa06c23035002765de09'
- 'c44af94e19724ba23a11cec3ccc46ff9db307a058564d539dc533308e75ff43cfb5e42515bd49fdeb86e02cbc7575dc87c3b132d9d28d49f7e8fedab598c06f5'
- 'a2a6a128a405b4dbd06eb84c25b1971a5dcab4b918d6fec74da317b76485eda6b4b16ad972a85d9c8267b0a848787761fae75cd6bbb81d970a8cbc8683a2fc42')
-
-prepare() {
- cd $pkgname-$pkgver
- sed -i 's,# DATA_FOLDER=data,DATA_FOLDER=/var/lib/bitwarden_rs,
- 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
-}
-
-build() {
- cd $pkgname-$pkgver
- rustup set profile minimal
- BWRS_VERSION="$pkgver" cargo build --release --locked --features sqlite,mysql,postgresql
-}
-
-check() {
- cd $pkgname-$pkgver
- cargo test --release --locked --features sqlite,mysql,postgresql
-}
-
-package() {
- cd $pkgname-$pkgver
- install -Dm644 .env.template "$pkgdir"/etc/bitwarden_rs.env
- install -Dt "$pkgdir"/usr/bin target/release/bitwarden_rs
- install -Dm644 -t "$pkgdir"/usr/lib/systemd/system ../bitwarden_rs.service
- install -Dm644 ../$pkgname.sysusers.conf "$pkgdir"/usr/lib/sysusers.d/bitwarden_rs.conf
- install -Dm644 ../bitwarden_rs.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/bitwarden_rs.conf
-}
-
-# vim:set ts=2 sw=2 et:
Copied: vaultwarden/repos/community-x86_64/PKGBUILD (from rev 927331, vaultwarden/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-04 00:59:58 UTC (rev 927332)
@@ -0,0 +1,57 @@
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Markus Richter <mqus at disroot dot org>
+# Contributor: Timothée Ravier <tim at siosm.fr
+
+pkgname=vaultwarden
+pkgver=1.21.0
+pkgrel=1
+pkgdesc='Unofficial Bitwarden compatible server written in Rust'
+arch=('x86_64')
+url=https://github.com/dani-garcia/vaultwarden
+license=('GPL3')
+depends=('mariadb-libs' 'openssl' 'postgresql-libs' 'sqlite')
+makedepends=('rustup')
+optdepends=('vaultwarden-web: for the web app')
+provides=('bitwarden_rs')
+replaces=('bitwarden_rs')
+backup=('etc/vaultwarden.env')
+install=$pkgname.install
+source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+ "$pkgname.service"
+ "$pkgname.sysusers.conf"
+ "$pkgname.tmpfiles")
+b2sums=('39584a784df7e2ce75f174dc07721dc10621a08f46d8414193d06bac47114750692c705f417a56e79c18f54c67fb20b1b1237906658fcfd9c77b50c360904cd5'
+ '9d9c8b1cb1773a23e23dc0c6c99c8311a85793502d4055a80a77934a2149a6da3af0b221456641f34bee8265197267908812e800c9655d6b484fd045264e458a'
+ '6580cf4031f262638abf11e529e8dfc489197afd6cd616c6a7810741e03c004706a5f9358f825aac6644c0ab6b251627ff988ed68f8264120b3575a655972390'
+ '9cdcd6c997c884eb3c1ad0c9b8cd91e68ec6762a27f9b80a7eb6c0cb1ffa4e500a654da6f17e9f985cc67add154efe737761f74e4e5f72892fc0e9d457314973')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i "s,# DATA_FOLDER=data,DATA_FOLDER=/var/lib/$pkgname,
+ s,web-vault/,/usr/share/webapps/$pkgname-web,
+ s,# WEB_VAULT_ENABLED=true,WEB_VAULT_ENABLED=false,
+ s,/path/to/log,/var/log/$pkgname.log,
+ /^# ROCKET_TLS/a ROCKET_LIMITS={json=10485760}" .env.template
+}
+
+build() {
+ cd $pkgname-$pkgver
+ rustup set profile minimal
+ BWRS_VERSION="$pkgver" cargo build --release --locked --features sqlite,mysql,postgresql
+}
+
+check() {
+ cd $pkgname-$pkgver
+ cargo test --release --locked --features sqlite,mysql,postgresql
+}
+
+package() {
+ cd $pkgname-$pkgver
+ install -Dm644 .env.template "$pkgdir"/etc/$pkgname.env
+ install -Dt "$pkgdir"/usr/bin target/release/$pkgname
+ install -Dm644 -t "$pkgdir"/usr/lib/systemd/system ../$pkgname.service
+ install -Dm644 ../$pkgname.sysusers.conf "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
+ install -Dm644 ../$pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: bitwarden_rs.install
===================================================================
--- bitwarden_rs.install 2021-05-04 00:59:11 UTC (rev 927331)
+++ bitwarden_rs.install 2021-05-04 00:59:58 UTC (rev 927332)
@@ -1,24 +0,0 @@
-post_install() {
- cat << EOF
-Configure the server via its environment variables in /etc/bitwarden_rs.env.
-
-If bitwarden_rs is run at ports >1024, you should apply these systemd unit
-options via a drop-in file:
-[Service]
-CapabilityBoundingSet=
-AmbientCapabilities=
-PrivateUsers=yes
-
-If the service produces too much noise in your journal, you can redirect stdout
-to /dev/null (bitwarden_rs will still also write to /var/log/bitwarden_rs.log
-if configured to do so):
-[Service]
-StandardOutput=null
-
-Create or edit drop-in file:
-# systemctl edit bitwarden_rs
-
-Start bitwarden_rs and enable its systemd service:
-# systemctl enable --now bitwarden_rs
-EOF
-}
Deleted: bitwarden_rs.service
===================================================================
--- bitwarden_rs.service 2021-05-04 00:59:11 UTC (rev 927331)
+++ bitwarden_rs.service 2021-05-04 00:59:58 UTC (rev 927332)
@@ -1,55 +0,0 @@
-[Unit]
-Description=Bitwarden Server (Rust Edition)
-Documentation=https://github.com/dani-garcia/bitwarden_rs
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/bitwarden_rs
-WorkingDirectory=/var/lib/bitwarden_rs
-User=bitwarden_rs
-Group=bitwarden_rs
-
-# Allow bitwarden_rs to bind ports in the range of 0-1024 and restrict it to
-# that capability
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-# If bitwarden_rs is run at ports >1024, you should apply these options via a
-# drop-in file
-#CapabilityBoundingSet=
-#AmbientCapabilities=
-#PrivateUsers=yes
-
-NoNewPrivileges=yes
-
-LimitNOFILE=1048576
-LimitNPROC=64
-UMask=0077
-
-ProtectSystem=strict
-ProtectHome=yes
-ReadWritePaths=/var/lib/bitwarden_rs /var/log/bitwarden_rs.log
-PrivateTmp=yes
-PrivateDevices=yes
-ProtectHostname=yes
-ProtectClock=yes
-ProtectKernelTunables=yes
-ProtectKernelModules=yes
-ProtectKernelLogs=yes
-ProtectControlGroups=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-RemoveIPC=yes
-
-SystemCallFilter=@system-service
-SystemCallFilter=~@privileged @resources
-SystemCallArchitectures=native
-
-EnvironmentFile=/etc/bitwarden_rs.env
-
-[Install]
-WantedBy=multi-user.target
Deleted: bitwarden_rs.sysusers.conf
===================================================================
--- bitwarden_rs.sysusers.conf 2021-05-04 00:59:11 UTC (rev 927331)
+++ bitwarden_rs.sysusers.conf 2021-05-04 00:59:58 UTC (rev 927332)
@@ -1 +0,0 @@
-u bitwarden_rs - "bitwarden_rs user"
Deleted: bitwarden_rs.tmpfiles
===================================================================
--- bitwarden_rs.tmpfiles 2021-05-04 00:59:11 UTC (rev 927331)
+++ bitwarden_rs.tmpfiles 2021-05-04 00:59:58 UTC (rev 927332)
@@ -1,3 +0,0 @@
-d /var/lib/bitwarden_rs 0750 bitwarden_rs bitwarden_rs
-h /var/lib/bitwarden_rs - - - - +C
-f /var/log/bitwarden_rs.log 0640 bitwarden_rs bitwarden_rs
Copied: vaultwarden/repos/community-x86_64/vaultwarden.install (from rev 927331, vaultwarden/trunk/vaultwarden.install)
===================================================================
--- vaultwarden.install (rev 0)
+++ vaultwarden.install 2021-05-04 00:59:58 UTC (rev 927332)
@@ -0,0 +1,32 @@
+post_install() {
+ cat << EOF
+!NOTE!
+ bitwarden_rs is now vaultwarden:
+ https://github.com/dani-garcia/vaultwarden/discussions/1642
+
+ If upgrading from bitwarden_rs, do not to leave around files/directories
+ owned by the old bitwarden_rs user/group before removing the old bitwarden_rs
+ user/group.
+
+Configure the server via its environment variables in /etc/vaultwarden.env.
+
+If vaultwarden is run at ports >1024, you should apply these systemd unit
+options via a drop-in file:
+[Service]
+CapabilityBoundingSet=
+AmbientCapabilities=
+PrivateUsers=yes
+
+If the service produces too much noise in your journal, you can redirect stdout
+to /dev/null (vaultwarden will still also write to /var/log/vaultwarden.log if
+configured to do so):
+[Service]
+StandardOutput=null
+
+Create or edit drop-in file:
+# systemctl edit vaultwarden
+
+Start vaultwarden and enable its systemd service:
+# systemctl enable --now vaultwarden
+EOF
+}
Copied: vaultwarden/repos/community-x86_64/vaultwarden.service (from rev 927331, vaultwarden/trunk/vaultwarden.service)
===================================================================
--- vaultwarden.service (rev 0)
+++ vaultwarden.service 2021-05-04 00:59:58 UTC (rev 927332)
@@ -0,0 +1,55 @@
+[Unit]
+Description=Bitwarden Server (Rust Edition)
+Documentation=https://github.com/dani-garcia/vaultwarden
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/vaultwarden
+WorkingDirectory=/var/lib/vaultwarden
+User=vaultwarden
+Group=vaultwarden
+
+# Allow vaultwarden to bind ports in the range of 0-1024 and restrict it to
+# that capability
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+# If vaultwarden is run at ports >1024, you should apply these options via a
+# drop-in file
+#CapabilityBoundingSet=
+#AmbientCapabilities=
+#PrivateUsers=yes
+
+NoNewPrivileges=yes
+
+LimitNOFILE=1048576
+LimitNPROC=64
+UMask=0077
+
+ProtectSystem=strict
+ProtectHome=yes
+ReadWritePaths=/var/lib/vaultwarden /var/log/vaultwarden.log
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectHostname=yes
+ProtectClock=yes
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectKernelLogs=yes
+ProtectControlGroups=yes
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=yes
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+RemoveIPC=yes
+
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged @resources
+SystemCallArchitectures=native
+
+EnvironmentFile=/etc/vaultwarden.env
+
+[Install]
+WantedBy=multi-user.target
Copied: vaultwarden/repos/community-x86_64/vaultwarden.sysusers.conf (from rev 927331, vaultwarden/trunk/vaultwarden.sysusers.conf)
===================================================================
--- vaultwarden.sysusers.conf (rev 0)
+++ vaultwarden.sysusers.conf 2021-05-04 00:59:58 UTC (rev 927332)
@@ -0,0 +1 @@
+u vaultwarden - "vaultwarden user"
Copied: vaultwarden/repos/community-x86_64/vaultwarden.tmpfiles (from rev 927331, vaultwarden/trunk/vaultwarden.tmpfiles)
===================================================================
--- vaultwarden.tmpfiles (rev 0)
+++ vaultwarden.tmpfiles 2021-05-04 00:59:58 UTC (rev 927332)
@@ -0,0 +1,3 @@
+d /var/lib/vaultwarden 0750 vaultwarden vaultwarden
+h /var/lib/vaultwarden - - - - +C
+f /var/log/vaultwarden.log 0640 vaultwarden vaultwarden
More information about the arch-commits
mailing list