diff --git a/common/refinery.nix b/common/refinery.nix index 253369c..470201e 100644 --- a/common/refinery.nix +++ b/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"; }; }; }; diff --git a/deemz.org/GeoLite2-ASN.mmdb b/deemz.org/GeoLite2-ASN.mmdb new file mode 100644 index 0000000..c888792 Binary files /dev/null and b/deemz.org/GeoLite2-ASN.mmdb differ diff --git a/deemz.org/GeoLite2-City.mmdb b/deemz.org/GeoLite2-City.mmdb new file mode 100644 index 0000000..1c32cf7 Binary files /dev/null and b/deemz.org/GeoLite2-City.mmdb differ diff --git a/deemz.org/GeoLite2-Country.mmdb b/deemz.org/GeoLite2-Country.mmdb new file mode 100644 index 0000000..379e887 Binary files /dev/null and b/deemz.org/GeoLite2-Country.mmdb differ diff --git a/deemz.org/configuration.nix b/deemz.org/configuration.nix index 970e430..52b0dc4 100644 --- a/deemz.org/configuration.nix +++ b/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"; diff --git a/msdl/configuration.nix b/msdl/configuration.nix index 369f0df..50dafd3 100644 --- a/msdl/configuration.nix +++ b/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"; + ''; }; };