From 70402c939712e962c927f96a68ce7d898ed2fc89 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 22 Dec 2010 13:32:51 +0000 Subject: [PATCH] Adapted Disnix module to publish the svnBaseDir and to support the postgresql and subversion types svn path=/nixos/trunk/; revision=25236 --- modules/services/misc/disnix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix index ef4d7922e98a..0773b61c551a 100644 --- a/modules/services/misc/disnix.nix +++ b/modules/services/misc/disnix.nix @@ -12,6 +12,8 @@ let enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; enableMySQLDatabase = config.services.mysql.enable; + enablePostgreSQLDatabase = config.services.postgresql.enable; + enableSubversionRepository = config.services.svnserve.enable; enableTomcatWebApplication = config.services.tomcat.enable; }); in @@ -93,6 +95,7 @@ in // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; } // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; } // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } + // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; } // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) ( optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) )