From 1a5f3d133db20fd76369e0cdf7a11f6525145daa Mon Sep 17 00:00:00 2001
From: Milan Pässler <mil@nyantec.com>
Date: Wed, 15 Jul 2020 21:41:29 +0200
Subject: Revert "nixos/jicofo: use ExecStart instead of script"

This reverts commit d3a26a5ecd81e3aa1618679e05759083c9b5a9af.
Using ServiceConfig.ExecStart instead of script lead to the content not
being executed in a shell anymore, which broke the secrets being read
from a file and passed as a command line parameter.
---
 nixos/modules/services/networking/jicofo.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'nixos/modules/services/networking/jicofo.nix')

diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix
index 2142d8f7591..8c492600944 100644
--- a/nixos/modules/services/networking/jicofo.nix
+++ b/nixos/modules/services/networking/jicofo.nix
@@ -105,16 +105,17 @@ 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;
-- 
cgit 1.4.1