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

Compare commits

base: nyanloutre:e10c46d37ed8345120be10e354f57e3f7f81c4d3
Branches Tags
nyanloutre:master
..
compare: nyanloutre:8b5d860942cf495ef4b3880ad9c7c4ac2fabe699
Branches Tags
nyanloutre:master

No commits in common. "e10c46d37ed8345120be10e354f57e3f7f81c4d3" and "8b5d860942cf495ef4b3880ad9c7c4ac2fabe699" have entirely different histories.
e10c46d37e ... 8b5d860942

5 changed files with 22 additions and 33 deletions
Show Stats 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.str; type = types.string;
example = "example.com"; example = "example.com";
description = '' description = ''
Sous domaine à utiliser Sous domaine à utiliser
@ -140,6 +140,7 @@ 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.str; type = types.string;
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:${config.services.phpfpm.pools.musique.socket}; fastcgi_pass unix:/run/phpfpm/musique;
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,22 +46,21 @@ in
}; };
}; };
services.phpfpm.pools.musique = { services.phpfpm.poolConfigs.musique = ''
user = "nginx"; listen = /run/phpfpm/musique
settings = { listen.owner = nginx
"listen.owner" = "nginx"; listen.group = nginx
"listen.group" = "nginx"; listen.mode = 0660
"listen.mode" = "0660"; user = nginx
"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.pname).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]); nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.name).name [ "factorio-headless" "perl5.28.1-slimserver" "minecraft-server" ]);
services.zfs = { services.zfs = {
autoSnapshot.enable = true; autoSnapshot.enable = true;

13
systems/LoutreOS/services.nix
View File

@ -11,7 +11,6 @@ let
musique_port = 52349; musique_port = 52349;
factorio_port = 52351; factorio_port = 52351;
airsonic_port = 4040; airsonic_port = 4040;
wkd_port = 52352;
jellyfin_backend = '' jellyfin_backend = ''
http-request set-header X-Forwarded-Port %[dst_port] http-request set-header X-Forwarded-Port %[dst_port]
@ -92,7 +91,6 @@ in
"ci.${domaine}" = { ip = "127.0.0.1"; port = 52350; auth = false; }; "ci.${domaine}" = { ip = "127.0.0.1"; port = 52350; auth = false; };
"factorio.${domaine}" = { ip = "127.0.0.1"; port = factorio_port; auth = false; }; "factorio.${domaine}" = { ip = "127.0.0.1"; port = factorio_port; auth = false; };
"airsonic.${domaine}" = { ip = "127.0.0.1"; port = airsonic_port; auth = false; }; "airsonic.${domaine}" = { ip = "127.0.0.1"; port = airsonic_port; auth = false; };
"${domaine}" = { ip = "127.0.0.1"; port = wkd_port; auth = false; };
}; };
}; };
@ -244,15 +242,6 @@ in
listen = [ { addr = "127.0.0.1"; port = factorio_port; } ]; listen = [ { addr = "127.0.0.1"; port = factorio_port; } ];
locations = { "/" = { root = "/var/www/factorio"; }; }; locations = { "/" = { root = "/var/www/factorio"; }; };
}; };
"wkd" = {
listen = [ { addr = "127.0.0.1"; port = wkd_port; } ];
locations = { "/.well-known/openpgpkey/" = {
alias = "/var/lib/gnupg/wks/nyanlout.re";
extraConfig = ''
add_header Access-Control-Allow-Origin * always;
'';
}; };
};
}; };
}; };
@ -412,7 +401,7 @@ in
database = { database = {
type = "postgres"; type = "postgres";
port = 5432; port = 5432;
passwordFile = "/var/lib/gitea/custom/conf/database_password"; passwordFile = "/mnt/secrets/gitea_database_passwordFile";
}; };
log.level = "Warn"; log.level = "Warn";
extraConfig = '' extraConfig = ''