Author: sandervanderburg
Date: Wed Nov 24 23:00:52 2010
New Revision: 24849
URL: https://svn.nixos.org/websvn/nix/?rev=24849&sc=1
Log:
The Disnix avahi server now also publishes the 'system' attribute and the
properties defined in config.deployment
Modified:
nixos/trunk/modules/services/misc/disnix.nix
Modified: nixos/trunk/modules/services/misc/disnix.nix
==============================================================================
--- nixos/trunk/modules/services/misc/disnix.nix Wed Nov 24 23:00:21
2010 (r24848)
+++ nixos/trunk/modules/services/misc/disnix.nix Wed Nov 24 23:00:52
2010 (r24849)
@@ -94,12 +94,14 @@
''
${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))}
'';
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
