From e4fad165aa5fdab338b26a480689af10061ad3b2 Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 17 Feb 2025 09:33:51 +0100 Subject: [PATCH] feat(mottarone): switch to glpi-agent module --- systems/mottarone/default.nix | 11 ++++++++++- systems/mottarone/glpi-agent.nix | 22 ---------------------- 2 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 systems/mottarone/glpi-agent.nix diff --git a/systems/mottarone/default.nix b/systems/mottarone/default.nix index 6d68fac..8f69b1f 100644 --- a/systems/mottarone/default.nix +++ b/systems/mottarone/default.nix @@ -9,7 +9,6 @@ let in { imports = [ - ./glpi-agent.nix ./urbackup.nix ]; @@ -36,6 +35,16 @@ in dnsovertls = "false"; }; + glpiAgent = { + enable = true; + settings = { + server = "https://assistance.sciencespo-lyon.fr"; + delaytime = 3600; + lazy = 0; + logger = "stderr"; + }; + }; + postgresql.enable = true; pgadmin = { enable = true; diff --git a/systems/mottarone/glpi-agent.nix b/systems/mottarone/glpi-agent.nix deleted file mode 100644 index 915dd89..0000000 --- a/systems/mottarone/glpi-agent.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, pkgs, ... }: -{ - environment.systemPackages = [ pkgs.glpi-agent ]; - - systemd.services."glpi-agent" = { - description = "GLPI agent"; - after = [ - "syslog.target" - "network.target" - ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = "${lib.getExe pkgs.glpi-agent} --conf-file /etc/glpi-agent/agent.cfg --vardir /var/lib/glpi-agent --daemon --no-fork"; - ExecReload = "kill -HUP $MAINPID"; - CapabilityBoundingSet = "~CAP_SYS_PTRACE"; - - StateDirectory = "glpi-agent"; - WorkingDirectory = "/var/lib/glpi-agent"; - }; - }; -}