Merge branch 'staging-next' into staging

2021-04-29 02:35:54 +02:00
parent 9cf0393c37 af1c8ec459
commit 76c3a6aafd
34 changed files with 172 additions and 318 deletions
@@ -40,6 +40,7 @@ in {

      serviceConfig = {
        Restart = "on-failure";
+        TimeoutStopSec = 10;

        ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}";