From 2cdc39f3dcc29090d48d54bc8f24a67303e99ff2 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Thu, 18 Sep 2025 14:19:57 -0500
Subject: [PATCH] fix: disabled broken panoramax config

---
 .../nixos/defiant/configuration.nix           |  2 +-
 .../server/panoramax/database.nix             | 27 +++++++++++--------
 .../server/panoramax/panoramax.nix            | 18 ++++++++-----
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index a309704..d10bea0 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -307,7 +307,7 @@
     };
 
     panoramax = {
-      enable = true;
+      enable = false;
       openFirewall = true;
     };
 
diff --git a/modules/nixos-modules/server/panoramax/database.nix b/modules/nixos-modules/server/panoramax/database.nix
index 3cf3455..8679f9a 100644
--- a/modules/nixos-modules/server/panoramax/database.nix
+++ b/modules/nixos-modules/server/panoramax/database.nix
@@ -11,19 +11,24 @@
         };
       };
     }
-    (lib.mkIf config.host.postgres.enable {
-      host = {
-        postgres = {
-          extraUsers = {
-            ${config.services.panoramax.database.user} = {
-              isClient = true;
+    (
+      lib.mkIf config.host.postgres.enable {
+        host = {
+          postgres = {
+            extraUsers = {
+              ${config.services.panoramax.database.user} = {
+                isClient = true;
+                createUser = true;
+              };
+            };
+            extraDatabases = {
+              ${config.services.panoramax.database.name} = {
+                name = config.services.panoramax.database.user;
+              };
             };
           };
-          extraDatabases = {
-            ${config.services.panoramax.database.name} = {};
-          };
         };
-      };
-    })
+      }
+    )
   ]);
 }
diff --git a/modules/nixos-modules/server/panoramax/panoramax.nix b/modules/nixos-modules/server/panoramax/panoramax.nix
index 2af9982..fd77db7 100644
--- a/modules/nixos-modules/server/panoramax/panoramax.nix
+++ b/modules/nixos-modules/server/panoramax/panoramax.nix
@@ -206,12 +206,6 @@
             # Core Flask configuration
             FLASK_APP = "geovisio";
 
-            # Database configuration
-            DB_HOST = config.services.panoramax.database.host;
-            DB_PORT = toString config.services.panoramax.database.port;
-            DB_USERNAME = config.services.panoramax.database.user;
-            DB_NAME = config.services.panoramax.database.name;
-
             # Storage configuration
             FS_URL = config.services.panoramax.settings.storage.fsUrl;
 
@@ -224,6 +218,18 @@
             # Python path to include the panoramax package
             PYTHONPATH = "${config.services.panoramax.package}/${pkgs.python3.sitePackages}";
           }
+          // (
+            if config.services.panoramax.database.host == "/run/postgresql"
+            then {
+              DB_URL = "postgresql://${config.services.panoramax.database.user}@/${config.services.panoramax.database.name}?host=/run/postgresql";
+            }
+            else {
+              DB_HOST = config.services.panoramax.database.host;
+              DB_PORT = toString config.services.panoramax.database.port;
+              DB_USERNAME = config.services.panoramax.database.user;
+              DB_NAME = config.services.panoramax.database.name;
+            }
+          )
           // (lib.optionalAttrs (config.services.panoramax.settings.flask.secretKey != null) {
             FLASK_SECRET_KEY = config.services.panoramax.settings.flask.secretKey;
           })