Merge remote-tracking branch 'origin/master'

common/refinery.nix

@@ -43,7 +43,7 @@
 
         # Timeouts
         REFINERY_MODEL_GENERATION_TIMEOUT_SEC = "60";
-        REFINERY_MODEL_GENERATION_THREAD_COUNT = "10";
+        REFINERY_MODEL_GENERATION_THREAD_COUNT = "50";
       };
     };
   };

deemz.org/configuration.nix

@@ -83,6 +83,25 @@ let secrets = import ../secrets.nix; in
   };
   users.groups.icomidal = {};
 
+  # Run goaccess script hourly
+  systemd.timers.goaccess = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnCalendar = "hourly";
+      Persistent = true;
+      Unit = "goaccess.service";
+    };
+  };
+  systemd.services.goaccess = {
+    script = "${pkgs.gzip}/bin/zcat /var/log/nginx/access.log.*.gz | ${pkgs.goaccess}/bin/goaccess -a -o /var/log/nginx/goaccess.html --log-format=COMBINED --geoip-database=${./GeoLite2-City.mmdb} --geoip-database=${./GeoLite2-Country.mmdb} --geoip-database=${./GeoLite2-ASN.mmdb}  /var/log/nginx/access.log /var/log/nginx/access.log.1 -";
+    serviceConfig = {
+      Type = "oneshot";
+      User = "nginx";
+      Nice = 19; # low priority
+      IOSchedulingClass = "idle";
+    };
+  };
+
   services.xserver.xkb.layout = "us";
   services.xserver.xkb.options = "eurosign:e";
 

msdl/configuration.nix

@@ -62,6 +62,7 @@
   environment.systemPackages = with pkgs; [
     vim
     firefox
+    git
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -88,6 +89,9 @@
       forceSSL = true;
       sslCertificate = "/var/ssl_keys/msdl-testing.pem";
       sslCertificateKey = "/var/ssl_keys/msdl-testing.key";
+      extraConfig = ''
+        ssl_password_file "/var/ssl_keys/msdl-testing.passwd";
+      '';
     };
   };