summary refs log tree commit diff
path: root/nixos/modules/services/misc/disnix.nix
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2013-11-07 10:54:53 +0100
committerSander van der Burg <svanderburg@gmail.com>2013-11-07 10:54:53 +0100
commitd31b328d0ad5729aed55a99d72bec786720359aa (patch)
tree470482855536b540d4d9a9e670afd22fd1265c31 /nixos/modules/services/misc/disnix.nix
parent775b1bd4df5dfaba7dd8586487e8aed00a6fb216 (diff)
downloadnixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar.gz
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar.bz2
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar.lz
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar.xz
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.tar.zst
nixlib-d31b328d0ad5729aed55a99d72bec786720359aa.zip
Updated Disnix service definition to support new development version and mongo databases
Diffstat (limited to 'nixos/modules/services/misc/disnix.nix')
-rw-r--r--nixos/modules/services/misc/disnix.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 6419e6f8fc7b..72b98d1f84a5 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -15,6 +15,7 @@ let
     enablePostgreSQLDatabase = config.services.postgresql.enable;
     enableSubversionRepository = config.services.svnserve.enable;
     enableTomcatWebApplication = config.services.tomcat.enable;
+    enableMongoDatabase = config.services.mongodb.enable;
   });
 in
 
@@ -125,17 +126,18 @@ in
             ++ 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.svnserve.enable "svnserve.service"
+            ++ optional config.services.mongodb.enable "mongodb.service";
 
           restartIfChanged = false;
           
-          path = [ pkgs.nix pkgs.disnix ];
-        
-          script =
-          ''
-            export HOME=/root
-            disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia
-          '';
+          path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ];
+          
+          environment = {
+            HOME = "/root";
+          };
+
+          exec = "disnix-service";
         };
     } // optionalAttrs cfg.publishAvahi {
       disnixAvahi =