ehmry
/
nix-processmgmt-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix infinite recursion problem on systemd

This commit is contained in:
Sander van der Burg 2021-04-24 13:55:51 +02:00 committed by Sander van der Burg
parent 4ca919bced
commit c3f8ac395e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service-containers-agnostic/apache-tomcat/disnix-appserving-tomcat.nix
View File

@ -1,4 +1,4 @@
{tomcatConstructorFun, lib, tomcat, libmatthew_java, dbus_java, DisnixWebService, dysnomia, stateDir}:
{tomcatConstructorFun, lib, tomcat, libmatthew_java, dbus_java, DisnixWebService, dysnomia, stateDir, processManager}:
{dbus-daemon, ...}@args:
@ -14,5 +14,8 @@ import ./simple-appserving-tomcat.nix {
"${dbus_java}/share/java/dbus.jar"
];
webapps = instanceArgs.webapps or [ tomcat.webapps ] ++ [ DisnixWebService ];
dependencies = instanceArgs.dependencies or [] ++ [ dbus-daemon.pkg ];
dependencies = instanceArgs.dependencies or []
# If we use systemd, we should not add dbus-daemon as a dependency. It causes infinite recursion.
# Moreover, since D-Bus is already enabled for systemd, there is no reason to wait for it anyway.
++ lib.optional (dbus-daemon != null && processManager != "systemd") dbus-daemon.pkg;
})

2
service-containers-agnostic/constructors.nix
View File

@ -38,7 +38,7 @@ in
};
disnixAppservingTomcat = import ./apache-tomcat/disnix-appserving-tomcat.nix {
inherit stateDir;
inherit stateDir processManager;
inherit (pkgs) lib libmatthew_java dbus_java DisnixWebService;
tomcat = pkgs.tomcat9;
tomcatConstructorFun = constructors.simpleAppservingTomcat;