diff options
author | Izorkin <izorkin@elven.pw> | 2019-06-15 18:40:11 +0300 |
---|---|---|
committer | Izorkin <izorkin@elven.pw> | 2019-06-16 12:33:51 +0300 |
commit | d44f759b5588e5c9350958329409c7ab598740e5 (patch) | |
tree | 2c26c9c586df283c333d1d08c18e4fc16ca07011 /nixos | |
parent | 5b1a4730bc65ff7c5310bc885f9dbd0c28182fee (diff) | |
download | nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar.gz nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar.bz2 nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar.lz nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar.xz nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.tar.zst nixpkgs-d44f759b5588e5c9350958329409c7ab598740e5.zip |
nixos/restya-board: fix work with phpfpm-rootless mode
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/web-apps/restya-board.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 2e5e0ea6622..d4c99d6c44b 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -13,7 +13,7 @@ let runDir = "/run/restya-board"; poolName = "restya-board"; - phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm-${poolName}/${poolName}.sock"; in @@ -178,9 +178,12 @@ in config = mkIf cfg.enable { - services.phpfpm.poolConfigs = { + services.phpfpm.pools = { "${poolName}" = { - listen = phpfpmSocketName; + socketName = "${poolName}"; + phpPackage = pkgs.php; + user = "${cfg.user}"; + group = "${cfg.group}"; phpOptions = '' date.timezone = "CET" @@ -192,11 +195,9 @@ in ''} ''; extraConfig = '' - listen.owner = nginx - listen.group = nginx + listen.owner = ${config.services.nginx.user} + listen.group = ${config.services.nginx.group} listen.mode = 0600 - user = ${cfg.user} - group = ${cfg.group} pm = dynamic pm.max_children = 75 pm.start_servers = 10 @@ -365,6 +366,9 @@ in home = runDir; group = "restya-board"; }; + users.users.nginx = { + extraGroups = [ "restya-board" ]; + }; users.groups.restya-board = {}; services.postgresql.enable = mkIf (cfg.database.host == null) true; |