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

Updated disnix to latest 0.3 release

This commit is contained in:
Sander van der Burg 2013-06-27 15:32:49 +02:00
parent eb110fd3ce
commit 5dd0ce8c15
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ let
cfg = config.services.disnix;
disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: {
dysnomia = pkgs.dysnomia.override (origArgs: {
enableApacheWebApplication = config.services.httpd.enable;
enableAxis2WebService = config.services.tomcat.axis2.enable;
enableEjabberdDump = config.services.ejabberd.enable;
@ -95,7 +95,7 @@ in
name = "supportedtypes";
buildCommand = ''
( echo -n "[ "
cd ${disnix_activation_scripts}/libexec/disnix/activation-scripts
cd ${dysnomia}/libexec/dysnomia
for i in *
do
echo -n "\"$i\" "
@ -122,19 +122,19 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "dbus.service" ]
++ optional config.services.httpd.enable "httpd.service"
++ optional config.services.mysql.enable "mysql.service"
++ optional config.services.tomcat.enable "tomcat.service"
++ optional config.services.svnserve.enable "svnserve.service";
++ optional config.services.httpd.enable "httpd.service"
++ optional config.services.mysql.enable "mysql.service"
++ optional config.services.tomcat.enable "tomcat.service"
++ optional config.services.svnserve.enable "svnserve.service";
restartIfChanged = false;
path = [ pkgs.nix pkgs.disnix ];
script =
''
export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin
export HOME=/root
${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia
'';
};
} // optionalAttrs cfg.publishAvahi {