1 files changed, 27 insertions, 38 deletions
diff --git a/nixpkgs/nixos/tests/wordpress.nix b/nixpkgs/nixos/tests/wordpress.nix
index 5003e25a7d5b..774ef6293b51 100644
--- a/nixpkgs/nixos/tests/wordpress.nix
+++ b/nixpkgs/nixos/tests/wordpress.nix
@@ -6,48 +6,37 @@ import ./make-test.nix ({ pkgs, ... }:
     maintainers = [ grahamc ]; # under duress!
   };
 
-  nodes =
-    { web =
-        { pkgs, ... }:
-        {
-          services.mysql = {
-            enable = true;
-            package = pkgs.mysql;
-          };
-          services.httpd = {
-            enable = true;
-            logPerVirtualHost = true;
-            adminAddr="js@lastlog.de";
-
-            virtualHosts = [
-              {
-                hostName = "wordpress";
-                extraSubservices =
-                  [
-                    {
-                      serviceType = "wordpress";
-                      dbPassword = "wordpress";
-                      dbHost = "127.0.0.1";
-                      languages = [ "de_DE" "en_GB" ];
-                    }
-                  ];
-              }
-            ];
-          };
-        };
-    };
-
-  testScript =
+  machine =
     { ... }:
-    ''
-      startAll;
+    { services.httpd.adminAddr = "webmaster@site.local";
+      services.httpd.logPerVirtualHost = true;
+
+      services.wordpress."site1.local" = {
+        database.tablePrefix = "site1_";
+      };
 
-      $web->waitForUnit("mysql");
-      $web->waitForUnit("httpd");
+      services.wordpress."site2.local" = {
+        database.tablePrefix = "site2_";
+      };
+
+      networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
+
+      # required for wordpress-init.service to succeed
+      systemd.tmpfiles.rules = [
+        "F /var/lib/wordpress/site1.local/secret-keys.php 0440 wordpress wwwrun - -"
+        "F /var/lib/wordpress/site2.local/secret-keys.php 0440 wordpress wwwrun - -"
+      ];
+    };
 
-      $web->succeed("curl -L 127.0.0.1:80 | grep 'Welcome to the famous'");
+  testScript = ''
+    startAll;
 
+    $machine->waitForUnit("httpd");
+    $machine->waitForUnit("phpfpm-wordpress-site1.local");
+    $machine->waitForUnit("phpfpm-wordpress-site2.local");
 
-    '';
+    $machine->succeed("curl -L site1.local | grep 'Welcome to the famous'");
+    $machine->succeed("curl -L site2.local | grep 'Welcome to the famous'");
+  '';
 
 })