diff options
author | Niklas Hambüchen <mail@nh2.me> | 2018-10-26 18:07:56 +0200 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2018-11-03 18:39:46 +0100 |
commit | 2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0 (patch) | |
tree | 85d6d24513e1f5f696ac60448134c9cbfc99a31c /nixos/modules/services/networking | |
parent | df28b4b6e5a996a4971a0b32a98e654e4c44a54a (diff) | |
download | nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar.gz nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar.bz2 nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar.lz nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar.xz nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.tar.zst nixlib-2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0.zip |
consul: 0.9.3 -> 1.3.0.
Removes the old UI build tooling; it is no longer necessary because as of 1.2.0 it's bundled into the server binary. It doesn't even need to have JS built, because it's bundled into the release commit's source tree (see #48714). The UI is enabled by default, so the NixOS service is updated to directly use `ui = webUi;` now. Fixes #48714. Fixes #44192. Fixes #41243. Fixes #35602. Signed-off-by: Niklas Hambüchen <mail@nh2.me>
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/consul.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index ab3f81037681..0e90fed788b9 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -6,9 +6,10 @@ let dataDir = "/var/lib/consul"; cfg = config.services.consul; - configOptions = { data_dir = dataDir; } // - (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) // - cfg.extraConfig; + configOptions = { + data_dir = dataDir; + ui = cfg.webUi; + } // cfg.extraConfig; configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ] ++ cfg.extraConfigFiles; |