From d3a26a5ecd81e3aa1618679e05759083c9b5a9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Thu, 9 Jul 2020 00:24:53 +0200
Subject: [PATCH] nixos/jicofo: use ExecStart instead of script

---
 nixos/modules/services/networking/jicofo.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix
index 8c492600944..2142d8f7591 100644
--- a/nixos/modules/services/networking/jicofo.nix
+++ b/nixos/modules/services/networking/jicofo.nix
@@ -105,17 +105,16 @@ in
       ];
       environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps);
 
-      script = ''
-        ${pkgs.jicofo}/bin/jicofo \
-          --host=${cfg.xmppHost} \
-          --domain=${if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain} \
-          --secret=$(cat ${cfg.componentPasswordFile}) \
-          --user_name=${cfg.userName} \
-          --user_domain=${cfg.userDomain} \
-          --user_password=$(cat ${cfg.userPasswordFile})
-      '';
-
       serviceConfig = {
+        ExecStart = ''
+          ${pkgs.jicofo}/bin/jicofo \
+            --host=${cfg.xmppHost} \
+            --domain=${if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain} \
+            --secret=$(cat ${cfg.componentPasswordFile}) \
+            --user_name=${cfg.userName} \
+            --user_domain=${cfg.userDomain} \
+            --user_password=$(cat ${cfg.userPasswordFile})
+        '';
         Type = "exec";
 
         DynamicUser = true;