commit c7860cae1a4b54f4b54339142472f00f861fa055 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/module-list.nix

···

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

     

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

     

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

     

       477
       477
       -
         ./services/web-servers/phpfpm/default.nix

     

       477
       477
       +
         ./services/web-servers/phpfpm.nix

     

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

     

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

     

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

+17 -18

nixos/modules/services/web-apps/tt-rss.nix

···

       17
       17
        
           else cfg.database.port;

     

       18
       18
        
       

     

       19
       19
        
         poolName = "tt-rss";

     

       20
       20
       +
         phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";

     

       20
       21
        
         virtualHostName = "tt-rss";

     

       21
       22
        
       

     

       22
       23
        
         tt-rss-config = pkgs.writeText "config.php" ''

     
···

       448
       449
        
           root = "/var/lib/tt-rss";

     

       449
       450
        
         in mkIf cfg.enable {

     

       450
       451
        
       

     

       451
       451
       -
           services.phpfpm.pools = if cfg.pool == "${poolName}" then {

     

       452
       452
       -
             "${poolName}" =  {

     

       453
       453
       -
               listen = "/var/run/phpfpm/${poolName}.sock";

     

       454
       454
       -
               extraConfig = ''

     

       455
       455
       -
                 listen.owner = nginx

     

       456
       456
       -
                 listen.group = nginx

     

       457
       457
       -
                 listen.mode = 0600

     

       458
       458
       -
                 user = nginx

     

       459
       459
       -
                 pm = dynamic

     

       460
       460
       -
                 pm.max_children = 75

     

       461
       461
       -
                 pm.start_servers = 10

     

       462
       462
       -
                 pm.min_spare_servers = 5

     

       463
       463
       -
                 pm.max_spare_servers = 20

     

       464
       464
       -
                 pm.max_requests = 500

     

       465
       465
       -
                 catch_workers_output = 1

     

       466
       466
       -
               '';

     

       467
       467
       -
             };

     

       452
       452
       +
           services.phpfpm.poolConfigs = if cfg.pool == "${poolName}" then {

     

       453
       453
       +
             "${poolName}" = ''

     

       454
       454
       +
               listen = "${phpfpmSocketName}";

     

       455
       455
       +
               listen.owner = nginx

     

       456
       456
       +
               listen.group = nginx

     

       457
       457
       +
               listen.mode = 0600

     

       458
       458
       +
               user = nginx

     

       459
       459
       +
               pm = dynamic

     

       460
       460
       +
               pm.max_children = 75

     

       461
       461
       +
               pm.start_servers = 10

     

       462
       462
       +
               pm.min_spare_servers = 5

     

       463
       463
       +
               pm.max_spare_servers = 20

     

       464
       464
       +
               pm.max_requests = 500

     

       465
       465
       +
               catch_workers_output = 1

     

       466
       466
       +
             '';

     

       468
       467
        
           } else {};

     

       469
       468
        
       

     

       470
       469
        
           # TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged

     
···

       486
       485
        
           #     locations."~ \.php$" = {

     

       487
       486
        
           #       extraConfig = ''

     

       488
       487
        
           #         fastcgi_split_path_info ^(.+\.php)(/.+)$;

     

       489
       489
       -
           #         fastcgi_pass unix:${config.services.phpfpm.pools."${cfg.pool}".listen};

     

       488
       488
       +
           #         fastcgi_pass unix:${phpfpmSocketName};

     

       490
       489
        
           #         fastcgi_index index.php;

     

       491
       490
        
           #         fastcgi_param SCRIPT_FILENAME ${root}/$fastcgi_script_name;

     

       492
       491

+21 -13

nixos/modules/services/web-servers/phpfpm/default.nix nixos/modules/services/web-servers/phpfpm.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
       -
       

     

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

     

       19
       13
        
           [global]

     

       20
       14
        
           pid = ${pidFile}

     
···

       22
       16
        
           daemonize = yes

     

       23
       17
        
           ${cfg.extraConfig}

     

       24
       18
        
       

     

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

     

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

     

       26
       20
        
         '';

     

       27
       21
        
       

     

       28
       22
        
         phpIni = pkgs.writeText "php.ini" ''

     
···

       67
       61
        
                 "Options appended to the PHP configuration file <filename>php.ini</filename>.";

     

       68
       62
        
             };

     

       69
       63
        
       

     

       70
       70
       -
             pools = mkOption {

     

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

     

       72
       72
       -
                 inherit lib;

     

       73
       73
       -
               }));

     

       64
       64
       +
             poolConfigs = mkOption {

     

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

     

       74
       66
        
               default = {};

     

       67
       67
       +
               example = literalExample ''

     

       68
       68
       +
                 { mypool = '''

     

       69
       69
       +
                     listen = /run/phpfpm/mypool

     

       70
       70
       +
                     user = nobody

     

       71
       71
       +
                     pm = dynamic

     

       72
       72
       +
                     pm.max_children = 75

     

       73
       73
       +
                     pm.start_servers = 10

     

       74
       74
       +
                     pm.min_spare_servers = 5

     

       75
       75
       +
                     pm.max_spare_servers = 20

     

       76
       76
       +
                     pm.max_requests = 500

     

       77
       77
       +
                   ''';

     

       78
       78
       +
                 }

     

       79
       79
       +
               '';

     

       75
       80
        
               description = ''

     

       76
       76
       -
                 If no pools are defined, the phpfpm service is disabled.

     

       81
       81
       +
                 A mapping between PHP FPM pool names and their configurations.

     

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

     

       83
       83
       +
                 details on configuration directives. If no pools are defined,

     

       84
       84
       +
                 the phpfpm service is disabled.

     

       77
       85
        
               '';

     

       78
       86
        
             };

     

       79
       87
        
           };

     

       80
       88
        
         };

     

       81
       89
        
       

     

       82
       82
       -
         config = mkIf (cfg.pools != {}) {

     

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

     

       83
       91
        
       

     

       84
       92
        
           systemd.services.phpfpm = {

     

       85
       93
        
             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
       -