Daniel M. Capella pushed to branch main at Arch Linux / Packaging / Packages / 
vaultwarden


Commits:
7bc7f057 by Daniel M. Capella at 2024-12-30T16:45:50-05:00
Remove superfluous ROCKET_LIMITS from config

Don't recall why this was included. Keep the packaged config more
vanilla, 10 MB is the default:
https://github.com/dani-garcia/vaultwarden/wiki/Changing-the-API-request-size-limit

- - - - -
a77fa8cf by Daniel M. Capella at 2024-12-30T16:58:28-05:00
Switch to `patch` from stupid sexy `sed`

- - - - -


2 changed files:

- PKGBUILD
- + env-overrides.patch


Changes:

=====================================
PKGBUILD
=====================================
@@ -31,6 +31,7 @@ source=(
   systemd.service
   sysusers.conf
   tmpfiles.conf
+  env-overrides.patch
 )
 
sha512sums=('e1887090f75541418233e807a1072e9164f8103922f9f1bbaa663b50694b4a6a88e5bbdfae21da88b79ba31e704860c7e20c80afafedf8ce132dea2d31cac065'
             
'a12e993bbb568370b9a19f1634085eceda33c1f6bc98ea2c4fa2686a91676f3e9aafc681ab83450bf90b52e553770aabec871c311746faf2098e589cb67c7436'
@@ -43,16 +44,10 @@ 
b2sums=('cf9249e0c6dfde0a90f6e2e7a43f50050284142de43d5126cc983b754b19c2ae25b0d02
 
 prepare() {
   cd $pkgname
-
-  # change various defaults
-  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
-
   # download dependencies
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+
+  patch --forward --strip=1 --input=../env-overrides.patch
 }
 
 build() {


=====================================
env-overrides.patch
=====================================
@@ -0,0 +1,33 @@
+diff --git a/.env.template b/.env.template
+index ff0af609..b3f8a2ff 100644
+--- a/.env.template
++++ b/.env.template
+@@ -15,7 +15,7 @@
+ ####################
+ 
+ ## Main data folder
+-# DATA_FOLDER=data
++DATA_FOLDER=/var/lib/vaultwarden
+ 
+ ## Individual folders, these override %DATA_FOLDER%
+ # RSA_KEY_FILENAME=data/rsa_key
+@@ -31,8 +31,8 @@
+ # RELOAD_TEMPLATES=false
+ 
+ ## Web vault settings
+-# WEB_VAULT_FOLDER=web-vault/
+-# WEB_VAULT_ENABLED=true
++# WEB_VAULT_FOLDER=/usr/share/webapps/vaultwarden-web
++WEB_VAULT_ENABLED=false
+ 
+ #########################
+ ### Database settings ###
+@@ -370,7 +370,7 @@
+ # USE_SYSLOG=false
+ 
+ ## Logging to file
+-# LOG_FILE=/path/to/log
++# LOG_FILE=/var/log/vaultwarden.log
+ 
+ ## Log level
+ ## Change the verbosity of the log output



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/vaultwarden/-/compare/374bce81448ba6927a26404a480ebd79140d2293...a77fa8cf1a10802b34df2468d6d83f8e26fb29ad

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/vaultwarden/-/compare/374bce81448ba6927a26404a480ebd79140d2293...a77fa8cf1a10802b34df2468d6d83f8e26fb29ad
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to