services: monitoring: refactor

5 files changed, 4 insertions, 6 deletions

diff --git a/config/services/default.nix b/config/services/default.nix
index 161f037..e1dcb81 100644
--- a/config/services/default.nix
+++ b/config/services/default.nix
@@ -2,6 +2,4 @@
 
 {
   imports = [ ./web ];
-
-  personal.monitoring.enable = true;
 }
diff --git a/config/services/web/default.nix b/config/services/web/default.nix
index a7dbd18..859a3f4 100644
--- a/config/services/web/default.nix
+++ b/config/services/web/default.nix
@@ -34,5 +34,5 @@
     '';
   };
 
-  personal.monitoring.services = [ "nginx" ];
+  systemd.services.nginx.personal.monitor = true;
 }
diff --git a/config/services/web/rss/default.nix b/config/services/web/rss/default.nix
index 40fd053..c16327d 100644
--- a/config/services/web/rss/default.nix
+++ b/config/services/web/rss/default.nix
@@ -40,5 +40,5 @@ in {
     };
   };
 
-  personal.monitoring.services = [ "phpfpm-rss-bridge" ];
+  systemd.services.phpfpm-rss-bridge.personal.monitor = true;
 }
diff --git a/config/services/web/searx/default.nix b/config/services/web/searx/default.nix
index 99fc91a..5998068 100644
--- a/config/services/web/searx/default.nix
+++ b/config/services/web/searx/default.nix
@@ -31,5 +31,5 @@ in {
       enableACME = true;
     };
 
-  personal.monitoring.services = [ "uwsgi" ];
+  systemd.services.uwsgi.personal.monitor = true;
 }
diff --git a/config/services/web/searx/searx/default.nix b/config/services/web/searx/searx/default.nix
index a6cc9ee..f109258 100644
--- a/config/services/web/searx/searx/default.nix
+++ b/config/services/web/searx/searx/default.nix
@@ -54,5 +54,5 @@ in {
     };
   };
 
-  personal.monitoring.services = [ "searx-init" ];
+  systemd.services.searx-init.personal.monitor = true;
 }