all/voyager: update to nixos 24.05

This commit is contained in:
2024-05-31 22:19:23 +02:00
committed by Felix Albrigtsen
parent f2dd1c21e6
commit 5876717df1
4 changed files with 24 additions and 27 deletions

View File

@@ -7,14 +7,9 @@ let
maxUploadSize = "256M";
in {
options.services.snappymail = {
enable = mkEnableOption (lib.mdDoc "Snappymail");
enable = mkEnableOption "Snappymail";
package = mkOption {
type = types.package;
default = pkgs.snappymail;
defaultText = lib.mdDoc "pkgs.snappymail";
description = lib.mdDoc "Which snappymail package to use.";
};
package = mkPackageOption pkgs "snappymail" { };
dataDir = mkOption {
type = types.str;
@@ -23,8 +18,8 @@ in {
};
hostname = mkOption {
type = types.str;
/* default = null; */
type = types.nullOr types.str;
default = null;
example = "mail.example.com";
description = "Enable nginx with this hostname, null disables nginx";
};
@@ -32,13 +27,13 @@ in {
user = mkOption {
type = types.str;
default = "snappymail";
description = lib.mdDoc "System user under which snappymail runs";
description = "System user under which snappymail runs";
};
group = mkOption {
type = types.str;
default = "snappymail";
description = lib.mdDoc "System group under which snappymail runs";
description = "System group under which snappymail runs";
};
};
@@ -48,8 +43,6 @@ in {
description = "Snappymail service";
group = cfg.group;
home = cfg.dataDir;
useDefaultShell = true;
createHome = true;
isSystemUser = true;
};
};
@@ -88,8 +81,9 @@ in {
locations."^~ /data".extraConfig = ''
deny all;
'';
locations."~ \.php$".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
locations."~ \\.php$".extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_pass unix:${config.services.phpfpm.pools.snappymail.socket};
'';