Unverified Commit fa5d113d authored by Christian Kögler's avatar Christian Kögler Committed by GitHub
Browse files

nixos/{kanboard, roundcube, baikal, grocy, icingaweb2, selfoss, tt-rss}: don't... 

nixos/{kanboard, roundcube, baikal, grocy, icingaweb2, selfoss, tt-rss}: don't hard-code nginx user in service (#510765)
parents 72b9dddb 6b6166c5

nixos/modules/services/mail/roundcube.nix

+2 −2
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ in 
        upload_max_filesize = ${cfg.maxAttachmentSize}

      '';

      settings = lib.mapAttrs (name: lib.mkDefault) {

        "listen.owner" = "nginx";

        "listen.group" = "nginx";

        "listen.owner" = config.services.nginx.user;

        "listen.group" = config.services.nginx.group;

        "listen.mode" = "0660";

        "pm" = "dynamic";

        "pm.max_children" = 75;

nixos/modules/services/web-apps/baikal.nix

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ in 
          "BAIKAL_PATH_SPECIFIC" = "/var/lib/baikal/specific/";

        };

        settings = lib.mapAttrs (name: lib.mkDefault) {

          "listen.owner" = "nginx";

          "listen.group" = "nginx";

          "listen.owner" = config.services.nginx.user;

          "listen.group" = config.services.nginx.group;

          "listen.mode" = "0600";

          "pm" = "dynamic";

          "pm.max_children" = 75;

nixos/modules/services/web-apps/grocy.nix

+15 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ in 
        "pm" = "dynamic";

        "php_admin_value[error_log]" = "stderr";

        "php_admin_flag[log_errors]" = true;

        "listen.owner" = "nginx";

        "listen.owner" = config.services.nginx.user;

        "catch_workers_output" = true;

        "pm.max_children" = "32";

        "pm.start_servers" = "2";
@@ -52,6 +52,20 @@ in 
        "pm.max_spare_servers" = "4";

        "pm.max_requests" = "500";

      };

      defaultText = lib.literalExpression ''

        {

          "pm" = "dynamic";

          "php_admin_value[error_log]" = "stderr";

          "php_admin_flag[log_errors]" = true;

          "listen.owner" = config.services.nginx.user;

          "catch_workers_output" = true;

          "pm.max_children" = "32";

          "pm.start_servers" = "2";

          "pm.min_spare_servers" = "2";

          "pm.max_spare_servers" = "4";

          "pm.max_requests" = "500";

        }

      '';



      description = ''

        Options for grocy's PHPFPM pool.

nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix

+2 −2
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ in 
          date.timezone = "${cfg.timezone}"

        '';

        settings = mapAttrs (name: mkDefault) {

          "listen.owner" = "nginx";

          "listen.group" = "nginx";

          "listen.owner" = config.services.nginx.user;

          "listen.group" = config.services.nginx.group;

          "listen.mode" = "0600";

          "pm" = "dynamic";

          "pm.max_children" = 75;

nixos/modules/services/web-apps/kanboard.nix

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ in 
          "pm" = "dynamic";

          "php_admin_value[error_log]" = "stderr";

          "php_admin_flag[log_errors]" = true;

          "listen.owner" = "nginx";

          "listen.owner" = config.services.nginx.user;

          "catch_workers_output" = true;

          "pm.max_children" = "32";

          "pm.start_servers" = "2";