nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-25 18:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/wordpress: fix tests

Browse Source
This commit is contained in:
Weijia Wang
2024-09-19 22:25:37 +02:00
parent d0cbaf4baf
commit d582ac052d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/web-apps/wordpress.nix
View File

@@ -75,13 +75,16 @@ let
mkPhpValue = v: let
isHasAttr = s: isAttrs v && hasAttr s v;
# "you're escaped" -> "'you\'re escaped'"
# https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single
toPhpString = s: "'${escape [ "'" "\\" ] s}'";
in
if isString v then escapeShellArg v
if isString v then toPhpString v
# NOTE: If any value contains a , (comma) this will not get escaped
else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v)
else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v)
else if isInt v then toString v
else if isBool v then boolToString v
else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))"
else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))"
else if isHasAttr "_raw" then v._raw
else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded."
;

4
nixos/tests/wordpress.nix
View File

@@ -11,7 +11,7 @@ rec {
};
nodes = lib.foldl (a: version: let
package = pkgs."wordpress${version}";
package = pkgs."wordpress_${version}";
in a // {
"wp${version}_httpd" = _: {
services.httpd.adminAddr = "webmaster@site.local";
@@ -67,7 +67,7 @@ rec {
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
}) {} [
"6_3" "6_4"
"6_5" "6_6"
];
testScript = ''