about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2018-12-08 15:42:15 +0100
committerGitHub <noreply@github.com>2018-12-08 15:42:15 +0100
commit86d80a7b7888ac4c720e7e8d70f2bf879297c723 (patch)
tree056c2a60bc7b245a02bd0a1cd4390eaf60551886 /nixos/modules
parente6def98472ed616c0db74fe65db9346269bfbc89 (diff)
parent60eff0eecb308e4a38c4db76e20f0f49fd7f2715 (diff)
downloadnixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar.gz
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar.bz2
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar.lz
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar.xz
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.tar.zst
nixlib-86d80a7b7888ac4c720e7e8d70f2bf879297c723.zip
Merge pull request #51583 from WilliButz/grafana-update
grafana: 5.3.4 -> 5.4.0
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/monitoring/grafana.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index c0c16a429d89..5fb3e3771221 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -169,8 +169,9 @@ in {
           Sets the maximum amount of time (in seconds) a connection may be reused.
           For MySQL this setting should be shorter than the `wait_timeout' variable.
         '';
-        default = 14400;
-        type = types.int;
+        default = "unlimited";
+        example = 14400;
+        type = types.either types.int (types.enum [ "unlimited" ]);
       };
     };