commit 2aba1c496215d4ee788c47b94e5d06fea09134ff · pyrox.dev/nixpkgs

+1 -1

nixos/modules/module-list.nix

···

       476
       476
        
         ./services/web-servers/lighttpd/gitweb.nix

     

       477
       477
        
         ./services/web-servers/lighttpd/inginious.nix

     

       478
       478
        
         ./services/web-servers/nginx/default.nix

     

       479
       479
       -
         ./services/web-servers/phpfpm.nix

     

       479
       479
       +
         ./services/web-servers/phpfpm/default.nix

     

       480
       480
        
         ./services/web-servers/shellinabox.nix

     

       481
       481
        
         ./services/web-servers/tomcat.nix

     

       482
       482
        
         ./services/web-servers/uwsgi.nix

+20 -2

nixos/modules/services/web-servers/phpfpm.nix nixos/modules/services/web-servers/phpfpm/default.nix

···

       9
       9
        
       

     

       10
       10
        
         pidFile = "${stateDir}/phpfpm.pid";

     

       11
       11
        
       

     

       12
       12
       +
         mkPool = n: p: ''

     

       13
       13
       +
           [${n}]

     

       14
       14
       +
           listen = ${p.listen}

     

       15
       15
       +
           ${p.extraConfig}

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       12
       18
        
         cfgFile = pkgs.writeText "phpfpm.conf" ''

     

       13
       19
        
           [global]

     

       14
       20
        
           pid = ${pidFile}

     

       15
       21
        
           error_log = syslog

     

       16
       22
        
           daemonize = yes

     

       17
       23
        
           ${cfg.extraConfig}

     

       24
       24
       +
       

     

       25
       25
       +
           ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)}

     

       18
       26
        
       

     

       19
       27
        
           ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}

     

       20
       28
        
         '';

     
···

       62
       70
        
             };

     

       63
       71
        
       

     

       64
       72
        
             poolConfigs = mkOption {

     

       65
       65
       -
               type = types.attrsOf types.lines;

     

       66
       73
        
               default = {};

     

       74
       74
       +
               type = types.attrsOf types.lines;

     

       67
       75
        
               example = literalExample ''

     

       68
       76
        
                 { mypool = '''

     

       69
       77
        
                     listen = /run/phpfpm/mypool

     
···

       84
       92
        
                 the phpfpm service is disabled.

     

       85
       93
        
               '';

     

       86
       94
        
             };

     

       95
       95
       +
       

     

       96
       96
       +
             pools = mkOption {

     

       97
       97
       +
               type = types.attrsOf (types.submodule (import ./pool-options.nix {

     

       98
       98
       +
                 inherit lib;

     

       99
       99
       +
               }));

     

       100
       100
       +
               default = {};

     

       101
       101
       +
               description = ''

     

       102
       102
       +
                 If no pools are defined, the phpfpm service is disabled.

     

       103
       103
       +
               '';

     

       104
       104
       +
             };

     

       87
       105
        
           };

     

       88
       106
        
         };

     

       89
       107
        
       

     

       90
       90
       -
         config = mkIf (cfg.poolConfigs != {}) {

     

       108
       108
       +
         config = mkIf (cfg.pools != {}) {

     

       91
       109
        
       

     

       92
       110
        
           systemd.services.phpfpm = {

     

       93
       111
        
             wantedBy = [ "multi-user.target" ];

+35

nixos/modules/services/web-servers/phpfpm/pool-options.nix

···

       1
       1
       +
       { lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib; {

     

       4
       4
       +
       

     

       5
       5
       +
         options = {

     

       6
       6
       +
       

     

       7
       7
       +
           listen = mkOption {

     

       8
       8
       +
             type = types.str;

     

       9
       9
       +
             example = "/path/to/unix/socket";

     

       10
       10
       +
             description = ''

     

       11
       11
       +
               The address on which to accept FastCGI requests.

     

       12
       12
       +
             '';

     

       13
       13
       +
           };

     

       14
       14
       +
       

     

       15
       15
       +
           extraConfig = mkOption {

     

       16
       16
       +
             type = types.lines;

     

       17
       17
       +
             example = ''

     

       18
       18
       +
               user = nobody

     

       19
       19
       +
               pm = dynamic

     

       20
       20
       +
               pm.max_children = 75

     

       21
       21
       +
               pm.start_servers = 10

     

       22
       22
       +
               pm.min_spare_servers = 5

     

       23
       23
       +
               pm.max_spare_servers = 20

     

       24
       24
       +
               pm.max_requests = 500

     

       25
       25
       +
             '';

     

       26
       26
       +
       

     

       27
       27
       +
             description = ''

     

       28
       28
       +
               Extra lines that go into the pool configuration.

     

       29
       29
       +
               See the documentation on <literal>php-fpm.conf</literal> for

     

       30
       30
       +
               details on configuration directives.

     

       31
       31
       +
             '';

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       }

     

       35
       35
       +