From d4b21b6749591c217d2201f98610ff1cf6844c01 Mon Sep 17 00:00:00 2001
From: Reinout Meliesie <zedfrigg@kernelmaft.com>
Date: Mon, 10 Mar 2025 19:38:43 +0100
Subject: [PATCH] Include static web files, read config from /etc in Bookwyrm
 package

---
 packages/bookwyrm/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix
index 6006cd1..3538ab4 100644
--- a/packages/bookwyrm/package.nix
+++ b/packages/bookwyrm/package.nix
@@ -129,6 +129,7 @@ mkDerivation {
 
 		mkdir -p $out/bin
 		mkdir -p $out/lib/python3.11/site-packages
+		mkdir -p $out/srv/http/bookwyrm
 		mkdir -p $out/var/lib/bookwyrm
 
 		# Python dependencies
@@ -146,6 +147,10 @@ mkDerivation {
 
 		cp $src/manage.py $out/lib/python3.11/
 
+		# Static web files
+
+		cp -r /build/source/static $out/srv/http/bookwyrm/
+
 		# Executables
 
 		cat <<- EOF > $out/bin/bookwyrm
@@ -164,18 +169,19 @@ mkDerivation {
 				exit 1
 			fi
 
-			export PYTHONPATH="$out/lib/python3.11/site-packages"
+			export PYTHONPATH=$out/lib/python3.11/site-packages
 
-			export DEBUG="false"
+			export DEBUG=false
+
+			export DOMAIN="\$( cat /etc/bookwyrm/domain )"
 
-			export DOMAIN=""
 			export EMAIL=""
 			export EMAIL_HOST=""
 			export EMAIL_HOST_USER=""
 			export EMAIL_HOST_PASSWORD=""
 
 			# The escape here is required in order to retrieve the key file contents at runtime
-			export SECRET_KEY="\$( cat /etc/nixos/assets/bookwyrm-secret-key )"
+			export SECRET_KEY="\$( cat /etc/bookwyrm/secret-key )"
 
 			exec \$@
 		EOF