From 26dc7e503da14c3142541a3a741303e745d4ab33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Mon, 11 Apr 2016 09:35:28 -0400
Subject: [PATCH] Shout: fix infinite loop in service configuration

Fixes #14594.
---
 nixos/modules/services/networking/shout.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index 761ecbcd173d..3664c2857739 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -11,7 +11,7 @@ let
     mv config.js $out
   '';
 
-  configFile = if (cfg.configFile != null) then cfg.configFile else ''
+  finalConfigFile = if (cfg.configFile != null) then cfg.configFile else ''
     var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash')
 
     module.exports = _.merge(
@@ -48,7 +48,7 @@ in {
 
     configFile = mkOption {
       type = types.nullOr types.lines;
-      default = configFile;
+      default = null;
       description = ''
         Contents of Shout's <filename>config.js</filename> file.
 
@@ -95,7 +95,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
-      preStart = "ln -sf ${pkgs.writeText "config.js" configFile} ${shoutHome}/config.js";
+      preStart = "ln -sf ${pkgs.writeText "config.js" finalConfigFile} ${shoutHome}/config.js";
       script = concatStringsSep " " [
         "${pkgs.shout}/bin/shout"
         (if cfg.private then "--private" else "--public")