update module
This commit is contained in:
parent
d465101913
commit
8b6da2d7a2
1 changed files with 45 additions and 15 deletions
60
module.nix
60
module.nix
|
|
@ -5,34 +5,67 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.services.fragdenrat;
|
cfg = config.services.fragdenrat;
|
||||||
|
dataDir = "/var/lib/fragdenrat";
|
||||||
|
manageCmd = "${pkgs.fragdenrat}/bin/fragdenrat-manage";
|
||||||
|
pythonPath = "${pkgs.fragdenrat}/share:${pkgs.fragdenrat.pythonPath}";
|
||||||
|
envVars = [
|
||||||
|
"PYTHONPATH=${pythonPath}"
|
||||||
|
"DJANGO_SETTINGS_MODULE=fragdenrat.settings"
|
||||||
|
"FRAGDENRAT_DATA_DIR=${dataDir}"
|
||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
services.fragdenrat = {
|
services.fragdenrat = {
|
||||||
|
|
||||||
enable = lib.mkEnableOption "FragDenRat web app";
|
enable = lib.mkEnableOption "FragDenRat web app";
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# Ensure data dir exists with proper perms
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d ${dataDir} 0750 fragdenrat fragdenrat -"
|
||||||
|
"d ${dataDir}/staticfiles 0750 fragdenrat fragdenrat -"
|
||||||
|
];
|
||||||
|
|
||||||
|
# One-shot setup: migrate DB and collect static into dataDir
|
||||||
|
systemd.services.fragdenrat-setup = {
|
||||||
|
description = "Initialize FragDenRat database and static files";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
User = "fragdenrat";
|
||||||
|
Group = "fragdenrat";
|
||||||
|
WorkingDirectory = dataDir;
|
||||||
|
Environment = envVars;
|
||||||
|
};
|
||||||
|
script = ''
|
||||||
|
set -euo pipefail
|
||||||
|
${manageCmd} migrate --noinput
|
||||||
|
${manageCmd} collectstatic --noinput
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# uWSGI app
|
||||||
services.uwsgi = {
|
services.uwsgi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "python3" ];
|
plugins = [ "python3" ];
|
||||||
|
postActivation = ''
|
||||||
|
# Ensure setup runs before uwsgi serves
|
||||||
|
${config.systemd.package}/bin/systemctl start fragdenrat-setup.service
|
||||||
|
'';
|
||||||
instance = {
|
instance = {
|
||||||
type = "emperor";
|
type = "emperor";
|
||||||
vassals = {
|
vassals = {
|
||||||
fragdenrat = {
|
fragdenrat = {
|
||||||
type = "normal";
|
type = "normal";
|
||||||
chdir = "${pkgs.fragdenrat}/share/fragdenrat";
|
# Use data dir as working directory
|
||||||
|
chdir = dataDir;
|
||||||
|
|
||||||
# Absolute WSGI entrypoint
|
# Absolute WSGI entrypoint in Nix store
|
||||||
wsgi-file = "${pkgs.fragdenrat}/share/fragdenrat/wsgi.py";
|
wsgi-file = "${pkgs.fragdenrat}/share/fragdenrat/wsgi.py";
|
||||||
callable = "application";
|
callable = "application";
|
||||||
|
|
||||||
|
|
@ -49,15 +82,12 @@ in
|
||||||
need-app = true;
|
need-app = true;
|
||||||
"no-orphans" = true;
|
"no-orphans" = true;
|
||||||
|
|
||||||
env = [
|
env = envVars;
|
||||||
# Parent dir must be on sys.path so `import fragdenrat` resolves
|
|
||||||
"PYTHONPATH=${pkgs.fragdenrat}/share:${pkgs.fragdenrat.pythonPath}"
|
|
||||||
"DJANGO_SETTINGS_MODULE=fragdenrat.settings"
|
|
||||||
];
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
"static-map" = "/static=${pkgs.fragdenrat}/share/fragdenrat/assets";
|
# Serve collected static files from dataDir
|
||||||
# Mirror PYTHONPATH for uWSGI setting
|
"static-map" = "/static=${dataDir}/staticfiles";
|
||||||
|
# Python import path for the app and its deps
|
||||||
pythonpath = "${pkgs.fragdenrat}/share";
|
pythonpath = "${pkgs.fragdenrat}/share";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue