From 91e6d7411ef011a1a8ce2f1b00679afac5878120 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 12 Mar 2014 23:28:38 +0100 Subject: [PATCH] winstone NixOS module: Make it possible to set systemd service name --- nixos/modules/services/web-servers/winstone.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix index 8904745ed17c..33c7e7301182 100644 --- a/nixos/modules/services/web-servers/winstone.nix +++ b/nixos/modules/services/web-servers/winstone.nix @@ -13,6 +13,14 @@ let internal = true; }; + serviceName = mkOption { + type = types.str; + description = '' + The name of the systemd service. By default, it is + derived from the winstone instance name. + ''; + }; + warFile = mkOption { type = types.str; description = '' @@ -72,6 +80,7 @@ let config = { workDir = mkDefault "/run/winstone/${name}"; + serviceName = mkDefault "winstone-${name}"; }; }; @@ -113,7 +122,7 @@ in { config = mkIf (cfg != {}) { - systemd.services = mapAttrs' (n: c: nameValuePair "winstone-${n}" (mkService c)) cfg; + systemd.services = mapAttrs' (n: c: nameValuePair c.serviceName (mkService c)) cfg; };