From a64b46e61a46132500362247e9594f185fe6b6ac Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Wed, 28 Jun 2023 21:52:45 +0200
Subject: [PATCH] Make vault-agent not freak out on failed service restarts

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 nixos/systems/blowhole/klipper.nix    | 2 +-
 nixos/systems/blowhole/monitoring.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/systems/blowhole/klipper.nix b/nixos/systems/blowhole/klipper.nix
index a96dcfa..6e4b983 100644
--- a/nixos/systems/blowhole/klipper.nix
+++ b/nixos/systems/blowhole/klipper.nix
@@ -32,7 +32,7 @@ in
               pkgs.writeShellScript "envoy-mainsail-reload.sh"
                 ''
                   sudo systemd-run -P --machine klipper /run/current-system/sw/bin/bash -l -c \
-                    'systemctl try-reload-or-restart ${concatStringsSep " " serviceList}'
+                    'systemctl try-reload-or-restart ${concatStringsSep " " serviceList}' || true
                 '';
         }
       ];
diff --git a/nixos/systems/blowhole/monitoring.nix b/nixos/systems/blowhole/monitoring.nix
index 9a6a743..27f5189 100644
--- a/nixos/systems/blowhole/monitoring.nix
+++ b/nixos/systems/blowhole/monitoring.nix
@@ -166,7 +166,7 @@ in
             in
               pkgs.writeShellScript "envoy-grafana-reload.sh" ''
                 sudo systemd-run -P --machine monitor /run/current-system/sw/bin/bash -l -c \
-                  'systemctl try-reload-or-restart ${concatStringsSep " " serviceList}'
+                  'systemctl try-reload-or-restart ${concatStringsSep " " serviceList}' || true
               '';
         }
         {
@@ -175,7 +175,7 @@ in
           '';
           destination = "/run/secrets/envoy-blowhole.token";
           command = pkgs.writeShellScript "envoy-blowhole-reload.sh" ''
-            sudo systemctl try-reload-or-restart hashicorp-envoy-telegraf
+            sudo systemctl try-reload-or-restart hashicorp-envoy-telegraf || true
           '';
         }
         {
@@ -185,7 +185,7 @@ in
           destination = "/run/secrets/monitor/telegraf.env";
           command = pkgs.writeShellScript "monitor-telegraf-reload.sh" ''
             sudo systemd-run -P --machine monitor /run/current-system/sw/bin/bash -l -c \
-              'systemctl try-reload-or-restart telegraf'
+              'systemctl try-reload-or-restart telegraf' || true
           '';
         }
         {
@@ -198,7 +198,7 @@ in
           perms = "0644";
           command = pkgs.writeShellScript "monitor-telegraf-reload.sh" ''
             sudo systemd-run -P --machine monitor /run/current-system/sw/bin/bash -l -c \
-              'systemctl try-reload-or-restart grafana'
+              'systemctl try-reload-or-restart grafana' || true
           '';
         }
       ];