diff --git a/services/default.nix b/services/default.nix index 88e70ff..c2eb2f3 100644 --- a/services/default.nix +++ b/services/default.nix @@ -12,7 +12,6 @@ in # installées systématiquement ./haveged.nix ./monitoring-munin.nix - ./monitoring-smokeping.nix ./ssh.nix # commandées par config-generator diff --git a/services/monitoring-smokeping.nix b/services/monitoring-smokeping.nix deleted file mode 100644 index c15f523..0000000 --- a/services/monitoring-smokeping.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkIf mkMerge mkThenElse; - cfg = config.r6d.config-generator; - computers = config.r6d.computers; - profiles = config.r6d.profiles; -in - -mkIf cfg.smokeping { - - # Paquets - environment.systemPackages = with pkgs; [ - bind - ]; - - # Paquets avec setuid root - security.wrappers = { - # outil de diagnostic réseau - fping.source = "${pkgs.fping}/bin/fping"; - }; - - # Services - - services.smokeping = { - enable = true; - probeConfig = '' - + FPing - #binary = ${pkgs.fping}/bin/fping - binary = ${config.security.wrapperDir}/fping - - +DNS - #binary = ${pkgs.bind}/bin/dig - binary = /run/current-system/sw/bin/dig - forks = 5 - offset = 50% - step = 300 - timeout = 15 - ''; - targetConfig = '' - probe = FPing - menu = Top - title = Suivi de la latence reseau - remark = Monitoring de la latence reseau. \ - Here you will learn all about the latency of our network. - + Local - probe = FPing - menu = Local - title = Local Network - ++ LocalMachine - menu = Local Machine - title = This host - host = localhost - - + Grudu_Tinc - probe = FPing - title = Grudu_Tinc - menu = Grudu.net - Tinc - - ++ Hydra - menu = hydra.grudu.net - title = hydra.grudu.net - host = hydra.grudu.net - - ++ Monstre - menu = monstre.grudu.net - title = monstre.grudu.net - host = monstre.grudu.net - - ++ Rollo - menu = rollo.grudu.net - title = rollo.grudu.net - host = rollo.grudu.net - - ++ Ocean - menu = ocean.grudu.net - title = ocean.grudu.net - host = ocean.grudu.net - - ++ MultiHost - menu = Multihost - title = Ensemble de mesures de latence - host = /Grudu_Tinc/Monstre /Grudu_Tinc/Rollo /Grudu_Tinc/Ocean /Grudu_Tinc/Hydra - - + Grudu_DNS - title = Grudu_DNS - menu = Grudu.net - DNS - probe = DNS - pings = 5 - ++ Ocean - title = ocean - menu = serveur ocean - server = ocean.prunetwork.fr - +++ ocean - host = ocean.grudu.net - lookup = ocean.grudu.net - +++ rollo - host = rollo.grudu.net - lookup = rollo.grudu.net - ++ Rollo - title = rollo - menu = serveur rollo - server = rollo.dubronetwork.fr - +++ ocean - host = ocean.grudu.net - lookup = ocean.grudu.net - +++ rollo - host = rollo.grudu.net - lookup = rollo.grudu.net - ++ MultiHost - menu = Multihost - title = Ensemble de mesures DNS - host = /Grudu_DNS/Ocean/ocean /Grudu_DNS/Ocean/rollo /Grudu_DNS/Rollo/ocean /Grudu_DNS/Rollo/rollo - + France - probe = FPing - title = France - menu = Operateur francais - - ++ Atos - menu = Atos - title = www.atos.fr - host = www.atos.fr - - ++ Axialys - menu = Axialys - title = www.axialys.fr - host = www.axialys.fr - - ++ Azurtel - menu = azurtel - title = www.azurtel.fr - host = www.azurtel.fr - - ++ Bouygues-Telecom - menu = Bouygues-Telecom - title = www.bouygues-telecom.fr - host = www.bouygues-telecom.fr - - ++ Colt - menu = Colt - title = www.colt.fr - host = www.colt.fr - - ++ Completel - menu = completel - title = www.completel.fr - host = www.completel.fr - - ++ Free - menu = Free - title = www.free.fr - host = www.free.fr - - ++ Kosmos - menu = Kosmos - title = www.kosmos.fr - host = www.kosmos.fr - - ++ Orange - menu = Orange - title = www.orange.fr - host = www.orange.fr - - ++ Renater - menu = Renater - title = www.renater.fr - host = www.renater.fr - - ++ SFR - menu = SFR - title = www.sfr.fr - host = www.sfr.fr - - ++ MultiHost - menu = Multihost - title = Ensemble de mesures de latence - host = /France/Atos /France/Axialys /France/Azurtel \ - /France/Bouygues-Telecom \ - /France/Completel \ - /France/Free \ - /France/Kosmos \ - /France/Orange \ - /France/Renater \ - /France/SFR - - # /France/Colt - ''; - }; - - # Réseau - networking.firewall = { - allowedTCPPorts = [ - #8081 # accès depuis localhost uniquement ou à travers un proxy nginx - ]; - allowedUDPPorts = [ - ]; - }; -}