From 7754ddbed1abd4e30991460fe2b1ac7ba6ae051d Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 13 Mar 2025 15:07:30 +0100 Subject: [PATCH 1/2] Ensure 'images' directory exists in Bookwyrm systemd unit --- packages/bookwyrm/nixos-module.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/bookwyrm/nixos-module.nix b/packages/bookwyrm/nixos-module.nix index 968938c..cd757ca 100644 --- a/packages/bookwyrm/nixos-module.nix +++ b/packages/bookwyrm/nixos-module.nix @@ -16,6 +16,7 @@ with pkgs . kernelmaft ; # 'initdb' fails harmlessly if it has been run on the database before ExecStartPre=${coreutils-full}/bin/ln -sf ${bookwyrm}/var/lib/bookwyrm/VERSION /var/lib/bookwyrm/ + ExecStartPre=mkdir -p /var/lib/bookwyrm/images ExecStartPre=${bookwyrm}/bin/bookwyrm-env ${python311}/bin/python ${bookwyrm}/lib/python3.11/manage.py migrate ExecStartPre=-${bookwyrm}/bin/bookwyrm-env ${python311}/bin/python ${bookwyrm}/lib/python3.11/manage.py initdb ExecStart=${bookwyrm}/bin/bookwyrm-env ${bookwyrm}/bin/bookwyrm From 5af00580bbc7fbc7a1df58c7b010663e7c3dbb2d Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 13 Mar 2025 15:11:35 +0100 Subject: [PATCH 2/2] Update Bookwyrm git rev to 229a035a2b, remove 'bookwyrm-env' Redis vars The Redis environment variables belong in '/etc/bookwyrm/config.env'. --- packages/bookwyrm/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index 442445c..b993abb 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -91,8 +91,8 @@ mkDerivation { domain = "kernelmaft.com/forgejo" ; owner = "zedfrigg" ; repo = "bookwyrm" ; - rev = "984b9b08fc1219be5581e339c00d51d7f956fc3f" ; - hash = "sha256-mhULkMLm4g+J/UoPWRpoh0CXcFQ4MhkP0xKJvTzJVSM=" ; + rev = "229a035a2be1811123b5afcb035fab61d13f0a47" ; + hash = "sha256-0pwszQwx/RsCv3pxGifyAEpzXfTBiwOOt+h3pZuN3Bk=" ; } ; dontPatch = true ; @@ -179,8 +179,6 @@ mkDerivation { export PYTHONPATH=$out/lib/python3.11/site-packages export DEBUG=false - export REDIS_ACTIVITY_URL=unix:///run/redis-bookwyrm-activity/redis.sock - export REDIS_BROKER_URL=unix:///run/redis-bookwyrm-broker/redis.sock export STATIC_ROOT_ABS=$out/srv/http exec \$@