diff --git a/services/haproxy-acme.nix b/services/haproxy-acme.nix index fe72ce6..4309e95 100644 --- a/services/haproxy-acme.nix +++ b/services/haproxy-acme.nix @@ -84,7 +84,7 @@ in enable = mkEnableOption "HAproxy + ACME"; domaine = mkOption { - type = types.string; + type = types.str; example = "example.com"; description = '' Sous domaine à utiliser @@ -140,7 +140,6 @@ in ''; }; }; - security.acme.directory = "/var/lib/acme"; users.groups.acme.members = [ "haproxy" ]; diff --git a/services/mail-server.nix b/services/mail-server.nix index b104820..15a5288 100644 --- a/services/mail-server.nix +++ b/services/mail-server.nix @@ -9,7 +9,7 @@ in options.services.mailserver = { enable = mkEnableOption "Mail Server"; domaine = mkOption { - type = types.string; + type = types.str; example = "example.com"; description = "Nom de domaine du serveur de mails"; }; diff --git a/services/site-musique.nix b/services/site-musique.nix index 62cee74..ff4fde4 100644 --- a/services/site-musique.nix +++ b/services/site-musique.nix @@ -37,7 +37,7 @@ in extraConfig = '' location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/phpfpm/musique; + fastcgi_pass unix:${config.services.phpfpm.pools.musique.socket}; include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } @@ -46,21 +46,22 @@ in }; }; - services.phpfpm.poolConfigs.musique = '' - listen = /run/phpfpm/musique - listen.owner = nginx - listen.group = nginx - listen.mode = 0660 - user = nginx - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 20 - pm.max_requests = 500 - php_admin_value[error_log] = 'stderr' - php_admin_flag[log_errors] = on - catch_workers_output = yes - ''; + services.phpfpm.pools.musique = { + user = "nginx"; + settings = { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0660"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "php_admin_value[error_log]" = "stderr"; + "php_admin_flag[log_errors]" = "on"; + "catch_workers_output" = "yes"; + }; + }; }; } diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 51cee57..3cb1df7 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -33,7 +33,7 @@ in ]; nixpkgs.config.allowUnfree = false; - nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.name).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]); + nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]); services.zfs = { autoSnapshot.enable = true;