public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deployment attribute does not exists anymore, will fix this later

Browse Source 
svn path=/nixos/trunk/; revision=33747
This commit is contained in:
Sander van der Burg 2012-04-11 13:46:49 +00:00
parent 1d0c23bffb
commit a34e20e292
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/misc/disnix.nix
View File

@ -88,7 +88,7 @@ in
services.disnix.infrastructure = services.disnix.infrastructure =
optionalAttrs (cfg.publishInfrastructure.enable) optionalAttrs (cfg.publishInfrastructure.enable)
( { hostname = config.networking.hostName; ( { hostname = config.networking.hostName;
targetHost = config.deployment.targetHost; #targetHost = config.deployment.targetHost;
system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system; system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
supportedTypes = (import "${pkgs.stdenv.mkDerivation { supportedTypes = (import "${pkgs.stdenv.mkDerivation {
@ -104,7 +104,7 @@ in
''; '';
}}"); }}");
} }
// optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; } #// optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
// optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; } // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
// optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; } // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
// optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }