diff --git a/services-agnostic/apache/simple-webapp-apache.nix b/services-agnostic/apache/simple-webapp-apache.nix index fe592d5..d4aac0d 100644 --- a/services-agnostic/apache/simple-webapp-apache.nix +++ b/services-agnostic/apache/simple-webapp-apache.nix @@ -15,6 +15,11 @@ }: let + phpPackage = php.override { + apxs2Support = true; + inherit apacheHttpd; + }; + user = instanceName; group = instanceName; @@ -51,8 +56,8 @@ let preferLocalBuild = true; } '' - cat ${php}/etc/php.ini > $out - cat ${php.phpIni} > $out + cat ${phpPackage}/etc/php.ini > $out + cat ${phpPackage.phpIni} > $out ''; in import ./default.nix { @@ -106,7 +111,7 @@ import ./default.nix { '' else throw "Unknown type for module!" ) modules} ${lib.optionalString enablePHP '' - LoadModule php_module ${php}/modules/libphp.so + LoadModule php_module ${phpPackage}/modules/libphp.so ''} ServerAdmin ${serverAdmin} diff --git a/services-agnostic/disnix-service/dysnomia-env.nix b/services-agnostic/disnix-service/dysnomia-env.nix index c4f62b6..65e3015 100644 --- a/services-agnostic/disnix-service/dysnomia-env.nix +++ b/services-agnostic/disnix-service/dysnomia-env.nix @@ -39,7 +39,7 @@ let inherit processManager; }; - processManagerContainer = lib.recursiveUpdate (stdenv.lib.optionalAttrs (processManager == "supervisord") { + processManagerContainer = lib.recursiveUpdate (lib.optionalAttrs (processManager == "supervisord") { supervisord-program = { supervisordTargetDir = "/etc/supervisor/conf.d"; }; diff --git a/tests/apache-tomcat-ajp-reverse-proxy/default.nix b/tests/apache-tomcat-ajp-reverse-proxy/default.nix index 6e2ab02..c6a689a 100644 --- a/tests/apache-tomcat-ajp-reverse-proxy/default.nix +++ b/tests/apache-tomcat-ajp-reverse-proxy/default.nix @@ -1,6 +1,7 @@ { pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { + name = "apache-tomcat-ajp-reverse-proxy"; exprFile = ./processes.nix; extraParams = { inherit nix-processmgmt; diff --git a/tests/apache-tomcat/default.nix b/tests/apache-tomcat/default.nix index 279bf7d..f4dc425 100644 --- a/tests/apache-tomcat/default.nix +++ b/tests/apache-tomcat/default.nix @@ -1,6 +1,7 @@ { pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { + name = "apache-tomcat"; exprFile = ./processes.nix; extraParams = { inherit nix-processmgmt; diff --git a/tests/apache/default.nix b/tests/apache/default.nix index 744f8b9..3e905ea 100644 --- a/tests/apache/default.nix +++ b/tests/apache/default.nix @@ -1,6 +1,7 @@ { pkgs, testService, processManagers, profiles, nix-processmgmt }: testService { + name = "apache"; exprFile = ./processes.nix; extraParams = { inherit nix-processmgmt; @@ -13,7 +14,7 @@ testService { tests = {instanceName, instance, ...}: '' - machine.succeed("curl --fail http://localhost:${toString instance.port} | grep 'Hello world!'") + machine.succeed("curl --fail http://localhost:${toString instance.port} | grep 'Hello world'") ''; inherit processManagers profiles; diff --git a/tests/apache/processes.nix b/tests/apache/processes.nix index 6ac6b62..d585739 100644 --- a/tests/apache/processes.nix +++ b/tests/apache/processes.nix @@ -50,7 +50,7 @@ let
- +