diff options
| author | lassulus <lassulus@lassul.us> | 2020-09-15 20:16:44 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-09-15 20:16:44 +0200 |
| commit | 624deaddd03101890d2974fc9340a26c00051bf3 (patch) | |
| tree | 32b0f765be65385f092dff92ae09285a29a4845e /krebs/1systems | |
| parent | 91b7a2a58490a59d6090870a9db9eca8d11d9ab4 (diff) | |
| parent | 57e6296ac4ca6b600f9e57b2c347f413096d09ed (diff) | |
Merge remote-tracking branch 'gum/master' into HEAD
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 1 | ||||
| -rw-r--r-- | krebs/1systems/wolf/config.nix | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index c84887ea..08a3392b 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -18,6 +18,7 @@ <stockholm/krebs/2configs/shack/prometheus/server.nix> <stockholm/krebs/2configs/shack/prometheus/blackbox.nix> <stockholm/krebs/2configs/shack/prometheus/unifi.nix> + <stockholm/krebs/2configs/shack/prometheus/alertmanager-telegram.nix> <stockholm/krebs/2configs/shack/gitlab-runner.nix> ## Collect local statistics via collectd and send to collectd diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 029644ca..a9e8aafe 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -34,6 +34,22 @@ in # powerraw usb serial to mqtt and raw socket <stockholm/krebs/2configs/shack/powerraw.nix> + { # do not log to /var/spool/log + services.nginx.appendHttpConfig = '' + map $request_method $loggable { + default 1; + GET 0; + } + log_format vhost '$host $remote_addr - $remote_user ' + '[$time_local] "$request" $status ' + '$body_bytes_sent "$http_referer" ' + '"$http_user_agent"'; + error_log stderr; + access_log syslog:server=unix:/dev/log vhost; + ''; + services.journald.rateLimitBurst = 10000; + } + # create samba share for anonymous usage with the laser and 3d printer pc <stockholm/krebs/2configs/shack/share.nix> |