Completely remove immae.eu

diff --git a/modules/private/databases/default.nix b/modules/private/databases/default.nix
index 27b0ba8a388322d3ffaf56753f061974b1e4c593..c4a023ae86d754a3ba85f165ba1c867c8593e6f4 100644 (file)
--- a/modules/private/databases/default.nix
+++ b/modules/private/databases/default.nix
@@ -46,12 +46,6 @@ in
         inherit (config.myEnv.servers.eldiron.ldap) dn password;
       };
       authorizedHosts = {
-        immaeEu = [{
-          ip4 = [
-            config.myEnv.servers.immaeEu.ips.main.ip4
-            config.myEnv.servers.immaeEu.ips.alt.ip4
-          ];
-        }];
       };
       replicationHosts = {
         backup-2 = {

diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index d23e9c5e572969611dc6f5e1041dd02622498681..8b45d470325bdb8742d01e0f32003d2f91384c1a 100644 (file)
--- a/modules/private/monitoring/default.nix
+++ b/modules/private/monitoring/default.nix
@@ -122,7 +122,7 @@ let
     };
   otherObjects = map
     (n: (pkgs.callPackage (./. + "/objects_" + n + ".nix") { inherit emailCheck; }))
-    [ "caldance-1" "ulminfo-fr" "immae-eu" "phare" "tiboqorl-fr" ];
+    [ "caldance-1" "ulminfo-fr" "phare" "tiboqorl-fr" ];
   masterObjects = pkgs.callPackage ./objects_master.nix { inherit config; };
   commonObjects = pkgs.callPackage ./objects_common.nix ({
     master = cfg.master;

diff --git a/modules/private/monitoring/objects_backup-2.nix b/modules/private/monitoring/objects_backup-2.nix
index 927cc25141cf36896d93ae57c219a21807d09ab3..cc8e36ba089c48cd3920c946db1274b4eb8efa96 100644 (file)
--- a/modules/private/monitoring/objects_backup-2.nix
+++ b/modules/private/monitoring/objects_backup-2.nix
@@ -29,9 +29,9 @@ in
     }
     {
       passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; };
-      service_description = "Last backup in /backup2/immae_eu is not too old";
+      service_description = "Last backup in /backup2/dilion is not too old";
       use = "local-service";
-      check_command = ["check_last_file_date" "/backup2/immae_eu" "14" "backup"];
+      check_command = ["check_last_file_date" "/backup2/dilion" "14" "backup"];
     }
     {
       passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; };

diff --git a/modules/private/monitoring/objects_immae-eu.nix b/modules/private/monitoring/objects_immae-eu.nix
deleted file mode 100644 (file)
index 96f91aa..0000000
--- a/modules/private/monitoring/objects_immae-eu.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ ... }:
-let
-  defaultPassiveInfo = {
-    use = "external-passive-service";
-    freshness_threshold = "450";
-    retry_interval = "1";
-    host_name = "immae.eu";
-  };
-in
-{
-  host = {
-    "immae.eu" = {
-      alias = "immae.eu";
-      address = "immae.eu";
-      use = "linux-server";
-      hostgroups = "webstatus-hosts";
-      _webstatus_name = "immaeEu";
-    };
-  };
-  service = map (s: defaultPassiveInfo // s) [
-    {
-      service_description = "size on root partition";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "total number of process";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "average load";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "swap usage";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "no mdadm array is degraded";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "ntp is activated and working";
-      servicegroups = "webstatus-resources";
-    }
-
-    {
-      service_description = "ssh connexion responds";
-    }
-
-    {
-      service_description = "pacman packages are not too old";
-      servicegroups = "webstatus-resources";
-      freshness_threshold = "10800";
-      notification_interval = "0";
-    }
-
-    {
-      service_description = "tinc@Immae service is active";
-    }
-
-    {
-      service_description = "sshd service is active";
-    }
-  ];
-}