public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14597 from valeriangalliat/hotfix/shout

Browse Source 
Shout: fix infinite loop in service configuration
This commit is contained in:
joachifm 2016-04-11 16:07:11 +02:00
commit 75d385f9fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/networking/shout.nix
View File

@ -11,7 +11,7 @@ let
mv config.js $out 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') var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash')
module.exports = _.merge( module.exports = _.merge(
@ -48,7 +48,7 @@ in {
configFile = mkOption { configFile = mkOption {
type = types.nullOr types.lines; type = types.nullOr types.lines;
default = configFile; default = null;
description = '' description = ''
Contents of Shout's <filename>config.js</filename> file. Contents of Shout's <filename>config.js</filename> file.
@ -95,7 +95,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "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 " " [ script = concatStringsSep " " [
"${pkgs.shout}/bin/shout" "${pkgs.shout}/bin/shout"
(if cfg.private then "--private" else "--public") (if cfg.private then "--private" else "--public")