diff --git a/machines/gerd/services/wger/default.nix b/machines/gerd/services/wger/default.nix index cf3e762..f46d595 100644 --- a/machines/gerd/services/wger/default.nix +++ b/machines/gerd/services/wger/default.nix @@ -22,7 +22,7 @@ let # to create a CACHE folder/file in the CWD. # and if I fix that, then static content no # longer wants to load. - DEBUG = false; + DEBUG = true; DATABASES.default = { ENGINE = "django.db.backends.postgresql"; NAME = "wger"; @@ -43,6 +43,7 @@ let MEDIA_ROOT = "${statedir}/media"; MEDIA_URL = "/media/"; + # EMAIL EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"; EMAIL_HOST = config.mine.shared.settings.mail.domain_smtp; @@ -53,12 +54,6 @@ let EMAIL_FROM_ADDRESS = wger_settings.EMAIL_FROM; EMAIL_PAGE_DOMAIN = SITE_URL; - # Cache - Redis - DJANGO_CACHE_BACKEND = "django_redis.cache.RedisCache"; - DJANGO_CACHE_LOCATION = "${config.services.redis.servers.wger.unixSocket}"; - DJANGO_CACHE_TIMEOUT = 1296000; # in seconds - 60*60*24*15, 15 Days - DJANGO_CACHE_CLIENT_CLASS = "django_redis.client.DefaultClient"; - # setup allowed hosts CSRF_TRUSTED_ORIGINS = [ "https://${svc_domain}" ]; ALLOWED_HOSTS = [ svc_domain ]; @@ -67,11 +62,6 @@ let RECAPTCHA_PUBLIC_KEY = ""; RECAPTCHA_PRIVATE_KEY = ""; USE_RECAPTCHA = false; - - # does not work - STATIC_ROOT = "${wgerpkgs}/share/static"; - COMPRESS_ROOT = STATIC_ROOT; - COMPRESS_OFFLINE = true; }; wger_settings_file = pkgs.writeText "settings.json" (builtins.toJSON wger_settings); @@ -115,10 +105,9 @@ in { serviceConfig = { EnvironmentFile = config.age.secrets.wger-env.path; - Restart = "on-failure"; - RestartSec = "5s"; - + # ensure it does not try to create `/CACHE` PrivateTmp = "yes"; + WorkingDirectory = "/tmp"; User = "wger"; Group = "wger"; @@ -160,11 +149,6 @@ in { }]; }; - # setup redis - services.redis.servers.wger = { - enable = true; - user = wger_user; - }; # setup users users.users."${wger_user}"= { @@ -186,8 +170,7 @@ in { proxyPass = "http://localhost:${builtins.toString port}"; }; - # locations."/static".proxyPass = "http://localhost:${builtins.toString port}"; - locations."/static".root = "${wgerpkgs}/share"; + locations."/static".proxyPass = "http://localhost:${builtins.toString port}"; locations."/media".proxyPass = "http://localhost:${builtins.toString port}"; locations."/api".proxyPass = "http://localhost:${builtins.toString port}"; }; diff --git a/machines/gerd/services/wger/wgerpkg/default.nix b/machines/gerd/services/wger/wgerpkg/default.nix index bb2438d..0148e84 100644 --- a/machines/gerd/services/wger/wgerpkg/default.nix +++ b/machines/gerd/services/wger/wgerpkg/default.nix @@ -3,7 +3,6 @@ python3, fetchFromGitHub, callPackage, - writeText, }: let @@ -80,37 +79,8 @@ in python3.pkgs.buildPythonApplication rec { cp manage.py wger/manage.py ''; - # fixup compressed files - postBuild = let - staticSettings = writeText "static_settings.py" '' - DEBUG = False - STATIC_ROOT = os.environ["static"] - COMPRESS_OFFLINE = True - # So we don't need postgres dependencies - DATABASES = {} - ''; - in '' - # copy over static yarn things - # cp -a ${frontend}/static/yarn $out/${python3.sitePackages}/wger/core/static - cp -a ${frontend}/static/yarn wger/core/static - - python3 -m wger.tasks create-settings -s $PWD/tmp_settings.py - cat ${staticSettings} >> $PWD/tmp_settings.py - mkdir tmpstatic - pushd tmpstatic - - static=. WGER_SETTINGS=../tmp_settings.py python3 ../manage.py collectstatic --no-input - static=. WGER_SETTINGS=../tmp_settings.py python3 ../manage.py compress --force - - popd - ''; - postInstall = '' - rm -rf $out/${python3.sitePackages}/wger/core/static - cp -a tmpstatic $out/${python3.sitePackages}/wger/core/static - - mkdir $out/share - cp -a $out/${python3.sitePackages}/wger/core/static $out/share + cp -a ${frontend}/static/yarn $out/${python3.sitePackages}/wger/core/static ''; pythonImportsCheck = [ diff --git a/shared/sources/default.nix b/shared/sources/default.nix index 4dffde4..d268f1b 100644 --- a/shared/sources/default.nix +++ b/shared/sources/default.nix @@ -8,11 +8,11 @@ in sources // { src = sources.nixpkgs; name = "nixpkgs-patched"; patches = [ - # tmp - lldap: 0.5.1-unstable-2024-10-30 -> 0.6.1 - (pkgs.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/359835.patch"; - sha256 = "sha256-2C9l4v9MaUJyiaB+kslTsSjsqTZ7RlcfMNlRzZblMik="; - }) + # tmp - lldap: 0.5.1-unstable-2024-08-09 -> 0.5.1-unstable-2024-10-30 + # (pkgs.fetchpatch { + # url = "https://github.com/NixOS/nixpkgs/pull/352840.patch"; + # sha256 = "sha256-O4zxn4AgUrggCkqUEkmVsUAbMTL/Jhki6Q+j1mhHWLw="; + # }) # tmp - stalwart-mail.webadmin: pin wasm-bindgen-cli version # (pkgs.fetchpatch { # url = "https://github.com/NixOS/nixpkgs/pull/353360.patch";