commit c76bebc549f2bd81bf5c70617d3d564a1ae6e8d1 · pyrox.dev/nixpkgs

+18 -28

nixos/tests/web-servers/unit-php.nix

···

       1
       1
        
       import ../make-test-python.nix ({pkgs, ...}:

     

       2
       2
       -
        let

     

       3
       3
       -
           testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";

     

       2
       2
       +
       let

     

       3
       3
       +
         testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";

     

       4
       4
        
       

     

       5
       5
        
       in {

     

       6
       6
        
         name = "unit-php-test";

     
···

       9
       9
        
         machine = { config, lib, pkgs, ... }: {

     

       10
       10
        
           services.unit = {

     

       11
       11
        
             enable = true;

     

       12
       12
       -
             config = ''

     

       13
       13
       -
               {

     

       14
       14
       -
                 "listeners": {

     

       15
       15
       -
                   "*:9074": {

     

       16
       16
       -
                     "application": "php_74"

     

       17
       17
       -
                   }

     

       18
       18
       -
                 },

     

       19
       19
       -
                 "applications": {

     

       20
       20
       -
                   "php_74": {

     

       21
       21
       -
                     "type": "php 7.4",

     

       22
       22
       -
                     "processes": 1,

     

       23
       23
       -
                     "user": "testuser",

     

       24
       24
       -
                     "group": "testgroup",

     

       25
       25
       -
                     "root": "${testdir}/www",

     

       26
       26
       -
                     "index": "info.php",

     

       27
       27
       -
                     "options": {

     

       28
       28
       -
                       "file": "${pkgs.unit.usedPhp74}/lib/php.ini"

     

       29
       29
       -
                     }

     

       30
       30
       -
                   }

     

       31
       31
       -
                 }

     

       32
       32
       -
               }

     

       33
       33
       -
             '';

     

       12
       12
       +
             config = pkgs.lib.strings.toJSON {

     

       13
       13
       +
               listeners."*:9080".application = "php_80";

     

       14
       14
       +
               applications.php_80 = {

     

       15
       15
       +
                 type = "php 8.0";

     

       16
       16
       +
                 processes = 1;

     

       17
       17
       +
                 user = "testuser";

     

       18
       18
       +
                 group = "testgroup";

     

       19
       19
       +
                 root = "${testdir}/www";

     

       20
       20
       +
                 index = "info.php";

     

       21
       21
       +
                 options.file = "${pkgs.unit.usedPhp80}/lib/php.ini";

     

       22
       22
       +
               };

     

       23
       23
       +
             };

     

       34
       24
        
           };

     

       35
       25
        
           users = {

     

       36
       26
        
             users.testuser = {

     

       37
       27
        
               isSystemUser = true;

     

       38
       38
       -
               uid = 1074;

     

       28
       28
       +
               uid = 1080;

     

       39
       29
        
               group = "testgroup";

     

       40
       30
        
             };

     

       41
       31
        
             groups.testgroup = {

     

       42
       42
       -
               gid= 1074;

     

       32
       32
       +
               gid = 1080;

     

       43
       33
        
             };

     

       44
       34
        
           };

     

       45
       35
        
         };

     
···

       47
       37
        
           machine.wait_for_unit("unit.service")

     

       48
       38
        
       

     

       49
       39
        
           # Check so we get an evaluated PHP back

     

       50
       50
       -
           response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9074/")

     

       51
       51
       -
           assert "PHP Version ${pkgs.unit.usedPhp74.version}" in response, "PHP version not detected"

     

       40
       40
       +
           response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9080/")

     

       41
       41
       +
           assert "PHP Version ${pkgs.unit.usedPhp80.version}" in response, "PHP version not detected"

     

       52
       42
        
       

     

       53
       43
        
           # Check so we have database and some other extensions loaded

     

       54
       44
        
           for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

+6 -1

pkgs/servers/http/unit/default.nix

···

       2
       2
        
       , pcre2

     

       3
       3
        
       , withPython2 ? false, python2

     

       4
       4
        
       , withPython3 ? true, python3, ncurses

     

       5
       5
       -
       , withPHP74 ? true, php74

     

       5
       5
       +
       , withPHP74 ? false, php74

     

       6
       6
       +
       , withPHP80 ? true, php80

     

       6
       7
        
       , withPerl530 ? false, perl530

     

       7
       8
        
       , withPerl532 ? true, perl532

     

       8
       9
        
       , withPerldevel ? false, perldevel

     
···

       26
       27
        
         };

     

       27
       28
        
       

     

       28
       29
        
         php74-unit = php74.override phpConfig;

     

       30
       30
       +
         php80-unit = php80.override phpConfig;

     

       29
       31
        
       

     

       30
       32
        
       in stdenv.mkDerivation rec {

     

       31
       33
        
         version = "1.24.0";

     
···

       44
       46
        
           ++ optional withPython2 python2

     

       45
       47
        
           ++ optionals withPython3 [ python3 ncurses ]

     

       46
       48
        
           ++ optional withPHP74 php74-unit

     

       49
       49
       +
           ++ optional withPHP80 php80-unit

     

       47
       50
        
           ++ optional withPerl530 perl530

     

       48
       51
        
           ++ optional withPerl532 perl532

     

       49
       52
        
           ++ optional withPerldevel perldevel

     
···

       62
       65
        
       

     

       63
       66
        
         # Optionally add the PHP derivations used so they can be addressed in the configs

     

       64
       67
        
         usedPhp74 = optionals withPHP74 php74-unit;

     

       68
       68
       +
         usedPhp80 = optionals withPHP80 php80-unit;

     

       65
       69
        
       

     

       66
       70
        
         postConfigure = ''

     

       67
       71
        
           ${optionalString withPython2    "./configure python --module=python2  --config=python2-config  --lib-path=${python2}/lib"}

     

       68
       72
        
           ${optionalString withPython3    "./configure python --module=python3  --config=python3-config  --lib-path=${python3}/lib"}

     

       69
       73
        
           ${optionalString withPHP74      "./configure php    --module=php74    --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}

     

       74
       74
       +
           ${optionalString withPHP80      "./configure php    --module=php80    --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}

     

       70
       75
        
           ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}

     

       71
       76
        
           ${optionalString withPerl532    "./configure perl   --module=perl532  --perl=${perl532}/bin/perl"}

     

       72
       77
        
           ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}