diff --git a/modules/kanboard.nix b/modules/kanboard.nix index 5eb155c..01afbe6 100644 --- a/modules/kanboard.nix +++ b/modules/kanboard.nix @@ -1,65 +1,49 @@ -{ pkgs, config, lib, ... }: +{ config, pkgs, ... }: let domain = "kanboard.${config.networking.domain}"; domain_short = "kb.${config.networking.domain}"; - user = "kanboard"; - group = "kanboard"; in { - users.users.${user} = { - group = group; - isSystemUser = true; - }; - users.groups.${group} = { }; + sops.secrets."kanboard_env" = { }; - services.phpfpm.pools.kanboard = { - user = "kanboard"; - group = "kanboard"; - settings = { - "listen.owner" = config.services.nginx.user; - "pm" = "dynamic"; - "pm.max_children" = 32; - "pm.max_requests" = 500; - "pm.start_servers" = 2; - "pm.min_spare_servers" = 2; - "pm.max_spare_servers" = 5; - "php_admin_value[error_log]" = "stderr"; - "php_admin_flag[log_errors]" = true; - "catch_workers_output" = true; + + # Podman + virtualisation.containers.enable = true; + virtualisation = { + podman = { + enable = true; + + # Create a `docker` alias for podman, to use it as a drop-in replacement + dockerCompat = true; + + # Required for containers under podman-compose to be able to talk to each other. + defaultNetwork.settings.dns_enabled = true; + }; + }; + virtualisation.oci-containers.backend = "podman"; + + virtualisation.oci-containers = { + containers.kanboard = { + image = "ghcr.io/kanboard/kanboard:v1.2.35"; + volumes = [ + "kanboard_data:/var/www/app/data" + "kanboard_plugins:/var/www/app/plugins" + ]; + ports = [ "127.0.0.1:8045:80" ]; + environmentFiles = [ + config.sops.secrets."kanboard_env".path + ]; }; - phpEnv."PATH" = lib.makeBinPath [ pkgs.php ]; }; - - - services.nginx.enable = true; services.nginx = { virtualHosts."${domain_short}" = { locations."/".return = "301 $scheme://${domain}$request_uri"; }; virtualHosts."${domain}" = { - root = "/srv/web/kanboard"; - extraConfig = '' - index index.html index.php; - ''; - - locations = { - "/" = { - tryFiles = "$uri $uri/ =404"; - }; - "~ \.php$" = { - extraConfig = '' - try_files $uri =404; - fastcgi_pass unix:${config.services.phpfpm.pools.kanboard.socket}; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_index index.php; - include ${pkgs.nginx}/conf/fastcgi_params; - include ${pkgs.nginx}/conf/fastcgi.conf; - fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; - ''; - }; - "/data".return = "403"; + locations."/" = { + proxyPass = "http://127.0.0.1:8045"; }; }; }; diff --git a/modules/struktur-bot.nix b/modules/struktur-bot.nix index 4361dd4..9773474 100644 --- a/modules/struktur-bot.nix +++ b/modules/struktur-bot.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { sops.secrets."strukturbot_env" = { }; - virtualisation.docker.daemon.settings.dns = [ "141.30.1.1" "141.76.14.1" ]; + # virtualisation.docker.daemon.settings.dns = [ "141.30.1.1" "141.76.14.1" ]; virtualisation.oci-containers = { containers.struktur-bot = { image = "struktur-bot"; diff --git a/modules/web/ese.nix b/modules/web/ese.nix index 31ca66c..f55430c 100644 --- a/modules/web/ese.nix +++ b/modules/web/ese.nix @@ -7,7 +7,7 @@ in sops.secrets."directus_env" = { }; environment.systemPackages = [ pkgs.nodejs_21 ]; virtualisation.oci-containers = { - backend = "docker"; + # backend = "docker"; containers.directus-ese = { image = "directus/directus:latest"; volumes = [