From 8e2815884ae6e550547594a71a206dd023fe042d Mon Sep 17 00:00:00 2001 From: Lukas Schulz Date: Sun, 29 Nov 2020 15:17:25 +0100 Subject: [PATCH 1/3] added nginx statuspage for netdata to find --- configuration/server/cdn/cdn-lb.nix | 6 ++++++ configuration/server/cdn/cdn-master.nix | 6 ++++++ configuration/server/cdn/cdn-node.nix | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/configuration/server/cdn/cdn-lb.nix b/configuration/server/cdn/cdn-lb.nix index f717ba6..ac76079 100644 --- a/configuration/server/cdn/cdn-lb.nix +++ b/configuration/server/cdn/cdn-lb.nix @@ -13,6 +13,12 @@ auth_basic off; ''; }; + "/nginx_status" = { + extraConfig = '' + stub_status; + auth_basic off; + ''; + }; }; }; appendHttpConfig = '' diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix index 14e866c..e2a7214 100644 --- a/configuration/server/cdn/cdn-master.nix +++ b/configuration/server/cdn/cdn-master.nix @@ -30,6 +30,12 @@ in { auth_basic off; ''; }; + "/nginx_status" = { + extraConfig = '' + stub_status; + auth_basic off; + ''; + }; }; }; appendHttpConfig = '' diff --git a/configuration/server/cdn/cdn-node.nix b/configuration/server/cdn/cdn-node.nix index 5d86769..ba13e00 100644 --- a/configuration/server/cdn/cdn-node.nix +++ b/configuration/server/cdn/cdn-node.nix @@ -33,6 +33,12 @@ ''; }; + "/nginx_status" = { + extraConfig = '' + stub_status; + auth_basic off; + ''; + }; }; }; appendHttpConfig = '' From a6ea75a6d295846aeef96053caf28281d88af6b0 Mon Sep 17 00:00:00 2001 From: Lukas Schulz Date: Sun, 29 Nov 2020 15:28:57 +0100 Subject: [PATCH 2/3] moved stuff to common.nix --- configuration/server/cdn/cdn-lb.nix | 6 ------ configuration/server/cdn/cdn-master.nix | 6 ------ configuration/server/cdn/cdn-node.nix | 5 ----- configuration/server/cdn/common.nix | 10 ++++++++++ 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/configuration/server/cdn/cdn-lb.nix b/configuration/server/cdn/cdn-lb.nix index ac76079..f717ba6 100644 --- a/configuration/server/cdn/cdn-lb.nix +++ b/configuration/server/cdn/cdn-lb.nix @@ -13,12 +13,6 @@ auth_basic off; ''; }; - "/nginx_status" = { - extraConfig = '' - stub_status; - auth_basic off; - ''; - }; }; }; appendHttpConfig = '' diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix index e2a7214..14e866c 100644 --- a/configuration/server/cdn/cdn-master.nix +++ b/configuration/server/cdn/cdn-master.nix @@ -30,12 +30,6 @@ in { auth_basic off; ''; }; - "/nginx_status" = { - extraConfig = '' - stub_status; - auth_basic off; - ''; - }; }; }; appendHttpConfig = '' diff --git a/configuration/server/cdn/cdn-node.nix b/configuration/server/cdn/cdn-node.nix index ba13e00..04506c1 100644 --- a/configuration/server/cdn/cdn-node.nix +++ b/configuration/server/cdn/cdn-node.nix @@ -33,11 +33,6 @@ ''; }; - "/nginx_status" = { - extraConfig = '' - stub_status; - auth_basic off; - ''; }; }; }; diff --git a/configuration/server/cdn/common.nix b/configuration/server/cdn/common.nix index 4952783..4fbff56 100644 --- a/configuration/server/cdn/common.nix +++ b/configuration/server/cdn/common.nix @@ -8,6 +8,10 @@ services.netdata = { enable = true; + configText = '' + [global] + dbengine multihost disk space = 2307 + ''; }; # Enable nginx service @@ -45,6 +49,12 @@ gzip_types *; ''; }; + "/nginx_status" = { + extraConfig = '' + stub_status; + auth_basic off; + ''; + }; }; }; }; From c7fead272d8777568a1a2bc9d5c9eb60edc7079b Mon Sep 17 00:00:00 2001 From: Lukas Schulz Date: Sun, 29 Nov 2020 15:30:47 +0100 Subject: [PATCH 3/3] removed false }; --- configuration/server/cdn/cdn-node.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration/server/cdn/cdn-node.nix b/configuration/server/cdn/cdn-node.nix index 04506c1..5d86769 100644 --- a/configuration/server/cdn/cdn-node.nix +++ b/configuration/server/cdn/cdn-node.nix @@ -33,7 +33,6 @@ ''; }; - }; }; }; appendHttpConfig = ''