From 4fbf63bfaa46e7a2189ac8f5569cdf7634b07a9d Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 19 Aug 2025 10:17:08 +0200
Subject: [PATCH] update module

---
 module.nix | 67 +++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/module.nix b/module.nix
index b0250e7..a942901 100644
--- a/module.nix
+++ b/module.nix
@@ -21,40 +21,39 @@ in
 
 	config = lib.mkIf cfg.enable {
 
-		services.uwsgi = {
-			enable = true;
-			user = "fragify";
-			group = "fragify";
-			plugins = [ "python3" ];
-			instances.fragify = {
-				# Align with upstream module: put uwsgi options under settings
-				settings = {
-					"chdir" = "/";
-					"wsgi-file" = "${pkgs.fragify}/share/fragify/fragify_wsgi.py";
-					module = "fragify:app";
-					# Socket
-					"socket" = "unix:${config.services.uwsgi.runDir}/fragify.sock";
-					"chmod-socket" = "660";
-					umask = "0077";
-					vacuum = true;
-					master = true;
-					processes = 2;
-					threads = 2;
-					"harakiri" = 60;
-					"buffer-size" = 65535;
-					"need-app" = true;
-					"no-orphans" = true;
-					# Serve static files directly via uWSGI (optional)
-					# Map /static to packaged assets directory (if present)
-					"static-map" = "/static=${pkgs.fragify}/share/fragify/assets";
-				};
-				# Environment for the WSGI app
-				env = {
-					FRAGIFY_TEMPLATES_DIR = "${pkgs.fragify}/share/fragify/templates";
-					FRAGIFY_STATIC_DIR = "${pkgs.fragify}/share/fragify/assets";
-				};
-				# Python packages for uWSGI
-				pythonPackages = p: with p; [ falcon requests jinja2 ];
+		# uWSGI configuration (nixos-25.05 uses `instance`, not `instances`)
+		services.uwsgi.enable = true;
+		services.uwsgi.user = "fragify";
+		services.uwsgi.group = "fragify";
+		services.uwsgi.plugins = [ "python3" ];
+		services.uwsgi.instance."fragify" = {
+			type = "normal";
+			chdir = "/";
+			# WSGI entry from packaged share dir
+			wsgi-file = "${pkgs.fragify}/share/fragify/fragify_wsgi.py";
+			module = "fragify:app";
+			# Socket
+			socket = "unix:${config.services.uwsgi.runDir}/fragify.sock";
+			"chmod-socket" = "660";
+			umask = "0077";
+			vacuum = true;
+			master = true;
+			processes = 2;
+			threads = 2;
+			harakiri = 60;
+			"buffer-size" = 65535;
+			need-app = true;
+			"no-orphans" = true;
+			# Pass environment to the app
+			env = {
+				FRAGIFY_TEMPLATES_DIR = "${pkgs.fragify}/share/fragify/templates";
+				FRAGIFY_STATIC_DIR = "${pkgs.fragify}/share/fragify/assets";
+			};
+			# Python deps for the embedded interpreter
+			pythonPackages = p: with p; [ falcon requests jinja2 ];
+			# Extra raw uWSGI settings not covered by module options
+			settings = {
+				"static-map" = "/static=${pkgs.fragify}/share/fragify/assets";
 			};
 		};