nyanloutre/nixos-config
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

changements pour 19.09

Browse Source
This commit is contained in:
nyanloutre 2019-10-04 22:36:31 +02:00
parent e028e0b545
commit b8b055d492
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/haproxy-acme.nix
View File

@ -84,7 +84,7 @@ in
enable = mkEnableOption "HAproxy + ACME"; enable = mkEnableOption "HAproxy + ACME";
domaine = mkOption { domaine = mkOption {
type = types.string; type = types.str;
example = "example.com"; example = "example.com";
description = '' description = ''
Sous domaine à utiliser Sous domaine à utiliser
@ -140,7 +140,6 @@ in
''; '';
}; };
}; };
security.acme.directory = "/var/lib/acme";
users.groups.acme.members = [ "haproxy" ]; users.groups.acme.members = [ "haproxy" ];

2
services/mail-server.nix
View File

@ -9,7 +9,7 @@ in
options.services.mailserver = { options.services.mailserver = {
enable = mkEnableOption "Mail Server"; enable = mkEnableOption "Mail Server";
domaine = mkOption { domaine = mkOption {
type = types.string; type = types.str;
example = "example.com"; example = "example.com";
description = "Nom de domaine du serveur de mails"; description = "Nom de domaine du serveur de mails";
}; };

35
services/site-musique.nix
View File

@ -37,7 +37,7 @@ in
extraConfig = '' extraConfig = ''
location ~* \.php$ { location ~* \.php$ {
fastcgi_split_path_info ^(.+\.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_params;
include ${pkgs.nginx}/conf/fastcgi.conf; include ${pkgs.nginx}/conf/fastcgi.conf;
} }
@ -46,21 +46,22 @@ in
}; };
}; };
services.phpfpm.poolConfigs.musique = '' services.phpfpm.pools.musique = {
listen = /run/phpfpm/musique user = "nginx";
listen.owner = nginx settings = {
listen.group = nginx "listen.owner" = "nginx";
listen.mode = 0660 "listen.group" = "nginx";
user = nginx "listen.mode" = "0660";
pm = dynamic "pm" = "dynamic";
pm.max_children = 75 "pm.max_children" = 75;
pm.start_servers = 2 "pm.start_servers" = 2;
pm.min_spare_servers = 1 "pm.min_spare_servers" = 1;
pm.max_spare_servers = 20 "pm.max_spare_servers" = 20;
pm.max_requests = 500 "pm.max_requests" = 500;
php_admin_value[error_log] = 'stderr' "php_admin_value[error_log]" = "stderr";
php_admin_flag[log_errors] = on "php_admin_flag[log_errors]" = "on";
catch_workers_output = yes "catch_workers_output" = "yes";
''; };
};
}; };
} }

2
systems/LoutreOS/configuration.nix
View File

@ -33,7 +33,7 @@ in
]; ];
nixpkgs.config.allowUnfree = false; 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 = { services.zfs = {
autoSnapshot.enable = true; autoSnapshot.enable = true;