7 files changed, 10 insertions, 11 deletions

diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock
index ac6095b..baf7dcd 100644
--- a/systems/backup-2/flake.lock
+++ b/systems/backup-2/flake.lock
@@ -417,7 +417,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=",
+        "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock
index b5bf0ce..71557c0 100644
--- a/systems/dilion/flake.lock
+++ b/systems/dilion/flake.lock
@@ -207,7 +207,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=",
+        "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 8c8872a..599cdf2 100644
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -2066,7 +2066,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=",
+        "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index 973a9ef..dd2a52e 100644
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -277,7 +277,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=",
+        "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
diff --git a/systems/monitoring-1/monitoring-master.nix b/systems/monitoring-1/monitoring-master.nix
index 6981672..ae1930c 100644
--- a/systems/monitoring-1/monitoring-master.nix
+++ b/systems/monitoring-1/monitoring-master.nix
@@ -66,6 +66,7 @@ in
           $USER201$=@@TOKEN@@
         '';
       };
+      "=/common/debian-packages".alias = pkgs.writeText "debian-packages" (builtins.concatStringsSep " " config.myServices.monitoring.availablePlugins.base.debianPackages);
       "=/common/.env.example".alias = ./monitoring/env.example;
       "=/common/docker-compose.yml".alias = ./monitoring/docker-compose.yml;
       "=/common/Dockerfile".alias = ./monitoring/Dockerfile;
diff --git a/systems/monitoring-1/monitoring/Dockerfile b/systems/monitoring-1/monitoring/Dockerfile
index 4bbf01b..e99b065 100644
--- a/systems/monitoring-1/monitoring/Dockerfile
+++ b/systems/monitoring-1/monitoring/Dockerfile
@@ -3,13 +3,11 @@ FROM debian:bookworm
 ARG namespace
 
 RUN \
-  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl \
-    gnupg
+  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
 
 RUN \
-  curl -s "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" | gpg --dearmor > /usr/share/keyrings/naemon.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/naemon.gpg] https://download.opensuse.org/repositories/home:/naemon/Debian_12/ ./" >> /etc/apt/sources.list.d/naemon-stable.list
+  curl -s -o /etc/apt/trusted.gpg.d/naemon.asc "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" \
+  && echo "deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon/Debian_$(. /etc/os-release && echo "$VERSION_ID")/ ./" >> /etc/apt/sources.list.d/naemon-stable.list
 
 # Install the baseline packages for this image. Note, these 
 # packages are not version controlled and may change between
@@ -17,7 +15,7 @@ RUN \
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   # La liste des packages debian à installer est directement fournie par Immae
-  apt-get install -y $(curl https://status.immae.eu/$namespace/debian-packages)
+  apt-get install -y $(curl -s https://status.immae.eu/${namespace:-common}/debian-packages)
 
 # Perform the data directory initialization
 RUN mkdir -p /data/var/log/naemon \
diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index cb2d403..95e58d0 100644
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -239,7 +239,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JoRDMcdd3yCwmMTcntzqPOEKRuubert3/1S1hLHIwbg=",
+        "narHash": "sha256-UtTwF1ni+Qy4n65KjH2WLtb263VIf7fnvVWExxSMR6U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },