diff options
| author | tv <tv@krebsco.de> | 2020-10-03 13:44:30 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-10-03 13:44:30 +0200 |
| commit | d1e52425e0d5d79a33b11c92cc2afb498075d953 (patch) | |
| tree | 29277982f014eaae680e006b6afc7fdb42e8d9b2 /krebs/1systems | |
| parent | 654f64f05935a69607a540f2e8d15619cee9e15e (diff) | |
| parent | 7e7499d86302d261c8f8404fb34f2ac091318d0e (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 1 | ||||
| -rw-r--r-- | krebs/1systems/wolf/config.nix | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index c84887eaa..08a3392bd 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 029644ca6..0160f9ebb 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -27,6 +27,8 @@ in <stockholm/krebs/2configs/shack/muellshack.nix> # provide light control api <stockholm/krebs/2configs/shack/node-light.nix> + # light.shack web-ui + <stockholm/krebs/2configs/shack/light.shack.nix> # send mail if muell was not handled <stockholm/krebs/2configs/shack/muell_mail.nix> # send mail if muell was not handled @@ -34,6 +36,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> |