From b064f5c80ecc012b252d9856784485d4a82714e1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 24 Nov 2010 23:00:52 +0000 Subject: [PATCH] The Disnix avahi server now also publishes the 'system' attribute and the properties defined in config.deployment svn path=/nixos/trunk/; revision=24849 --- modules/services/misc/disnix.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix index 7eeed998d2d..dee19b0577a 100644 --- a/modules/services/misc/disnix.nix +++ b/modules/services/misc/disnix.nix @@ -94,12 +94,14 @@ in '' ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \ "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \ + "system=\"$(uname -m)-linux\"" \ "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \ ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \ ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \ ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \ ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \ - "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" + "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \ + ${concatMapStrings (deploymentAttrName: let deploymentAttrValue = getAttr deploymentAttrName (config.deployment); in ''${deploymentAttrName}=\"${deploymentAttrValue}\" '' ) (attrNames (config.deployment))} ''; }; };