jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: disabled broken panoramax config

Browse source
This commit is contained in:
Leyla Becker 2025-09-18 14:19:57 -05:00
parent 333c68a8cd
commit 2cdc39f3dc
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configurations/nixos/defiant/configuration.nix
View file

@ -307,7 +307,7 @@
}; };
panoramax = { panoramax = {
enable = true; enable = false;
openFirewall = true; openFirewall = true;
}; };

27
modules/nixos-modules/server/panoramax/database.nix
View file

@ -11,19 +11,24 @@
}; };
}; };
} }
(lib.mkIf config.host.postgres.enable { (
host = { lib.mkIf config.host.postgres.enable {
postgres = { host = {
extraUsers = { postgres = {
${config.services.panoramax.database.user} = { extraUsers = {
isClient = true; ${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} = {};
};
}; };
}; }
}) )
]); ]);
} }

18
modules/nixos-modules/server/panoramax/panoramax.nix
View file

@ -206,12 +206,6 @@
# Core Flask configuration # Core Flask configuration
FLASK_APP = "geovisio"; 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 # Storage configuration
FS_URL = config.services.panoramax.settings.storage.fsUrl; FS_URL = config.services.panoramax.settings.storage.fsUrl;
@ -224,6 +218,18 @@
# Python path to include the panoramax package # Python path to include the panoramax package
PYTHONPATH = "${config.services.panoramax.package}/${pkgs.python3.sitePackages}"; 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) { // (lib.optionalAttrs (config.services.panoramax.settings.flask.secretKey != null) {
FLASK_SECRET_KEY = config.services.panoramax.settings.flask.secretKey; FLASK_SECRET_KEY = config.services.panoramax.settings.flask.secretKey;
}) })