Merge remote-tracking branch 'gum/master' into master

1 files changed, 8 insertions, 11 deletions

diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix
index 77c9ddc81..4abc7d345 100644
--- a/makefu/2configs/bgt/download.binaergewitter.de.nix
+++ b/makefu/2configs/bgt/download.binaergewitter.de.nix
@@ -17,12 +17,14 @@ in {
         PasswordAuthentication no
     '';
   };
+
   users.users.auphonic = {
     uid = genid "auphonic";
     group = "nginx";
     useDefaultShell = true;
     openssh.authorizedKeys.keys = [ ident config.krebs.users.makefu.pubkey ];
   };
+
   services.logrotate = {
     enable = true;
     config = ''
@@ -36,6 +38,12 @@ in {
     }
     '';
   };
+
+  # 20.09 unharden nginx to write logs
+  systemd.services.nginx.serviceConfig.ReadWritePaths = [
+    "/var/spool/nginx/logs/"
+  ];
+
   services.nginx = {
     appendHttpConfig = ''
       types {
@@ -55,15 +63,4 @@ in {
         '';
     };
   };
-  environment.etc."netdata/python.d/web_log.conf".text = ''
-    nginx_log3:
-      name: 'nginx'
-      path: '/var/spool/nginx/logs/access.log'
-    nginx_log4:
-      name: 'bgt'
-      path: '${bgtaccess}'
-  '';
-
-  users.users.netdata.extraGroups = [ "nginx" ];
-
 }