Author: sandervanderburg
Date: Wed Dec 22 13:32:51 2010
New Revision: 25236
URL: https://svn.nixos.org/websvn/nix/?rev=25236&sc=1
Log:
Adapted Disnix module to publish the svnBaseDir and to support the postgresql
and subversion types
Modified:
nixos/trunk/modules/services/misc/disnix.nix
Modified: nixos/trunk/modules/services/misc/disnix.nix
==============================================================================
--- nixos/trunk/modules/services/misc/disnix.nix Wed Dec 22 13:32:16
2010 (r25235)
+++ nixos/trunk/modules/services/misc/disnix.nix Wed Dec 22 13:32:51
2010 (r25236)
@@ -12,6 +12,8 @@
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 @@
// 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;
})
)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
