diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-08-11 10:03:28 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-08-15 21:00:27 -0400 |
| commit | d1129a56888b2395f938dd0e4ceccf968814745c (patch) | |
| tree | 01c5268fc0030119f77b581837a9c02849171f6b /nixos/tests/php-pcre.nix | |
| parent | ac4327c0256cdf8fc70f385a0b9ccb8068936871 (diff) | |
nixos/tests/php-pcre: replace usage of deprecated services.httpd.extraSubservices
Diffstat (limited to 'nixos/tests/php-pcre.nix')
| -rw-r--r-- | nixos/tests/php-pcre.nix | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix index 19bde9babad5d..ae44aec7944f4 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php-pcre.nix @@ -8,30 +8,25 @@ import ./make-test.nix ({ ...}: { services.httpd = { enable = true; adminAddr = "please@dont.contact"; - extraSubservices = lib.singleton { - function = f: { - enablePHP = true; - phpOptions = "pcre.jit = true"; + enablePHP = true; + phpOptions = "pcre.jit = true"; + extraConfig = + let + testRoot = pkgs.writeText "index.php" + '' + <?php + preg_match('/(${testString})/', '${testString}', $result); + var_dump($result); + ?> + ''; + in + '' + Alias / ${testRoot}/ - extraConfig = - let - testRoot = pkgs.writeText "index.php" - '' - <?php - preg_match('/(${testString})/', '${testString}', $result); - var_dump($result); - ?> - ''; - in - '' - Alias / ${testRoot}/ - - <Directory ${testRoot}> - Require all granted - </Directory> - ''; - }; - }; + <Directory ${testRoot}> + Require all granted + </Directory> + ''; }; }; testScript = { ... }: |