summary refs log tree commit diff
path: root/nixos/modules/services/monitoring
diff options
context:
space:
mode:
authorEmery Hemingway <emery@vfemail.net>2016-10-23 19:33:41 +0200
committerEmery Hemingway <emery@vfemail.net>2016-10-23 19:41:43 +0200
commitb67561939154eab53d10943f2eb255b9822194d3 (patch)
treeb1d139412197735da1a68d5c0c124c745d22de85 /nixos/modules/services/monitoring
parent795f968b17bca52f2e16ce16c4534c8a12cf85d8 (diff)
downloadnixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar.gz
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar.bz2
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar.lz
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar.xz
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.tar.zst
nixpkgs-b67561939154eab53d10943f2eb255b9822194d3.zip
nixos: use types.lines for extraConfig
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r--nixos/modules/services/monitoring/bosun.nix2
-rw-r--r--nixos/modules/services/monitoring/graphite.nix2
-rw-r--r--nixos/modules/services/monitoring/munin.nix1
-rw-r--r--nixos/modules/services/monitoring/zabbix-agent.nix1
4 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 9a1e790d3ab..496838a131b 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -107,7 +107,7 @@ in {
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration options for Bosun. You should describe your
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 1de3320dc42..b8be9296bc9 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -167,7 +167,7 @@ in {
             CACHE_TYPE: 'filesystem'
             CACHE_DIR: '/tmp/graphite-api-cache'
         '';
-        type = types.str;
+        type = types.lines;
       };
     };
 
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index aaa041ad4cd..57df16b58d9 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -100,6 +100,7 @@ in
 
       extraConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           <filename>munin-node.conf</filename> extra configuration. See
           <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index a943075be0c..88a63b4bf16 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -53,6 +53,7 @@ in
 
       extraConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Configuration that is injected verbatim into the configuration file.
         '';