nixos/tests/php-pcre: replace usage of deprecated services.httpd.extraSubservices

This commit is contained in:
Aaron Andersen 2019-08-11 10:03:28 -04:00
parent ac4327c025
commit d1129a5688

View File

@ -8,30 +8,25 @@ import ./make-test.nix ({ ...}: {
services.httpd = { services.httpd = {
enable = true; enable = true;
adminAddr = "please@dont.contact"; adminAddr = "please@dont.contact";
extraSubservices = lib.singleton { enablePHP = true;
function = f: { phpOptions = "pcre.jit = true";
enablePHP = true; extraConfig =
phpOptions = "pcre.jit = true"; let
testRoot = pkgs.writeText "index.php"
''
<?php
preg_match('/(${testString})/', '${testString}', $result);
var_dump($result);
?>
'';
in
''
Alias / ${testRoot}/
extraConfig = <Directory ${testRoot}>
let Require all granted
testRoot = pkgs.writeText "index.php" </Directory>
'' '';
<?php
preg_match('/(${testString})/', '${testString}', $result);
var_dump($result);
?>
'';
in
''
Alias / ${testRoot}/
<Directory ${testRoot}>
Require all granted
</Directory>
'';
};
};
}; };
}; };
testScript = { ... }: testScript = { ... }: