unit: Expose PHP expressions used so it can easily be accessed for configs
This commit is contained in:
parent
f75d62941d
commit
a4bf2cc166
|
@ -23,7 +23,10 @@ in {
|
||||||
"user": "testuser",
|
"user": "testuser",
|
||||||
"group": "testgroup",
|
"group": "testgroup",
|
||||||
"root": "${testdir}/www",
|
"root": "${testdir}/www",
|
||||||
"index": "info.php"
|
"index": "info.php",
|
||||||
|
"options": {
|
||||||
|
"file": "${pkgs.unit.usedPhp74}/lib/php.ini"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +45,13 @@ in {
|
||||||
};
|
};
|
||||||
testScript = ''
|
testScript = ''
|
||||||
machine.wait_for_unit("unit.service")
|
machine.wait_for_unit("unit.service")
|
||||||
assert "PHP Version ${pkgs.php74.version}" in machine.succeed("curl -vvv -s http://127.0.0.1:9074/")
|
|
||||||
|
# Check so we get an evaluated PHP back
|
||||||
|
response = machine.succeed("curl -vvv -s http://127.0.0.1:9074/")
|
||||||
|
assert "PHP Version ${pkgs.unit.usedPhp74.version}" in response, "PHP version not detected"
|
||||||
|
|
||||||
|
# Check so we have database and some other extensions loaded
|
||||||
|
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
|
||||||
|
assert ext in response, f"Missing {ext} extension"
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
|
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
||||||
++ optionals withPython3 [ python3 ncurses ]
|
++ optionals withPython3 [ python3 ncurses ]
|
||||||
++ optional withPHP72 php72-unit
|
++ optional withPHP72 php72-unit
|
||||||
++ optional withPHP73 php73-unit
|
++ optional withPHP73 php73-unit
|
||||||
++ optional withPHP73 php74-unit
|
++ optional withPHP74 php74-unit
|
||||||
++ optional withPerl528 perl528
|
++ optional withPerl528 perl528
|
||||||
++ optional withPerl530 perl530
|
++ optional withPerl530 perl530
|
||||||
++ optional withPerldevel perldevel
|
++ optional withPerldevel perldevel
|
||||||
|
@ -67,6 +67,11 @@ in stdenv.mkDerivation rec {
|
||||||
++ optional (!withIPv6) "--no-ipv6"
|
++ optional (!withIPv6) "--no-ipv6"
|
||||||
++ optional withDebug "--debug";
|
++ optional withDebug "--debug";
|
||||||
|
|
||||||
|
# Optionally add the PHP derivations used so they can be addressed in the configs
|
||||||
|
usedPhp72 = optionals withPHP72 php72-unit;
|
||||||
|
usedPhp73 = optionals withPHP73 php73-unit;
|
||||||
|
usedPhp74 = optionals withPHP74 php74-unit;
|
||||||
|
|
||||||
postConfigure = ''
|
postConfigure = ''
|
||||||
${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"}
|
${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"}
|
||||||
${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"}
|
${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user