From 5dd0ce8c15516757ca4c964837cd6843a78ed0a2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 27 Jun 2013 15:32:49 +0200 Subject: [PATCH] Updated disnix to latest 0.3 release --- modules/services/misc/disnix.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix index c50af6fb095..6419e6f8fc7 100644 --- a/modules/services/misc/disnix.nix +++ b/modules/services/misc/disnix.nix @@ -7,7 +7,7 @@ let cfg = config.services.disnix; - disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: { + dysnomia = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -95,7 +95,7 @@ in name = "supportedtypes"; buildCommand = '' ( echo -n "[ " - cd ${disnix_activation_scripts}/libexec/disnix/activation-scripts + cd ${dysnomia}/libexec/dysnomia for i in * do echo -n "\"$i\" " @@ -122,19 +122,19 @@ in wantedBy = [ "multi-user.target" ]; after = [ "dbus.service" ] - ++ optional config.services.httpd.enable "httpd.service" - ++ optional config.services.mysql.enable "mysql.service" - ++ optional config.services.tomcat.enable "tomcat.service" - ++ optional config.services.svnserve.enable "svnserve.service"; + ++ optional config.services.httpd.enable "httpd.service" + ++ optional config.services.mysql.enable "mysql.service" + ++ optional config.services.tomcat.enable "tomcat.service" + ++ optional config.services.svnserve.enable "svnserve.service"; restartIfChanged = false; + + path = [ pkgs.nix pkgs.disnix ]; script = '' - export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin export HOME=/root - - ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts + disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia ''; }; } // optionalAttrs cfg.publishAvahi {