diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-29 13:08:11 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-29 13:08:11 +0200 |
| commit | b2608b891062dcc95e50f00c304b297a727adf97 (patch) | |
| tree | 8b5c8773a75724455e3b67cb563ea84b0f9ec5e5 /nixos | |
| parent | 55357de67a2acfb11ba1a3633454c20acc9b54e7 (diff) | |
| parent | 140f47eb748f9b24a77fa40a1f1ffd2376a24b81 (diff) | |
| download | nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.gz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.bz2 nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.lz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.xz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.zst nixlib-b2608b891062dcc95e50f00c304b297a727adf97.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/exhibitor.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 1db422758671..600bd780e7b0 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -15,9 +15,12 @@ let election-port=${toString cfg.zkElectionPort} cleanup-period-ms=${toString cfg.zkCleanupPeriod} servers-spec=${concatStringsSep "," cfg.zkServersSpec} - auto-manage-instances=${lib.boolToString cfg.autoManageInstances} + auto-manage-instances=${toString cfg.autoManageInstances} ${cfg.extraConf} ''; + # NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended. + # Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false) + # will operate in the same fashion as a 0. configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig; cliOptionsCommon = { configtype = cfg.configType; |