Compare commits
6 Commits
2017-03-26
...
2017-04-10
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f16e4d8934 | ||
| e204ffb841 | |||
| 8c0a18a55b | |||
| fd834eb186 | |||
| f12b21f620 | |||
| 09212b7b67 |
@@ -20,5 +20,8 @@ environment.systemPackages = with pkgs; [
|
|||||||
|
|
||||||
## Mail & Discussion (texte, audio)
|
## Mail & Discussion (texte, audio)
|
||||||
mutt
|
mutt
|
||||||
|
|
||||||
|
## Sauvegarde nuagique (cloud storage)
|
||||||
|
rclone
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -341,11 +341,12 @@ globalkeys = awful.util.table.join(
|
|||||||
awful.key({ modkey }, "F5", function () awful.util.spawn("spacefm") end),
|
awful.key({ modkey }, "F5", function () awful.util.spawn("spacefm") end),
|
||||||
awful.key({ modkey }, "F6", function () awful.util.spawn("vlc") end),
|
awful.key({ modkey }, "F6", function () awful.util.spawn("vlc") end),
|
||||||
awful.key({ modkey }, "F7", function () awful.util.spawn("claws-mail") end),
|
awful.key({ modkey }, "F7", function () awful.util.spawn("claws-mail") end),
|
||||||
|
awful.key({ modkey }, "F11", function () awful.util.spawn("xrandr-auto") end),
|
||||||
awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end),
|
awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end),
|
||||||
awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end),
|
awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end),
|
||||||
awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end),
|
awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end),
|
||||||
awful.key({ modkey }, "F10", function () awful.util.spawn("xrandr-auto-2") end),
|
awful.key({ modkey, "Shift" }, "F6", function () awful.util.spawn("clementine") end),
|
||||||
awful.key({ modkey }, "F11", function () awful.util.spawn("xrandr-auto") end)
|
awful.key({ modkey, "Shift" }, "F11", function () awful.util.spawn("xrandr-auto-2") end)
|
||||||
-- awful.key({ modkey, "Shift" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
|
-- awful.key({ modkey, "Shift" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
|
||||||
-- awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
|
-- awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ in
|
|||||||
# installées systématiquement
|
# installées systématiquement
|
||||||
./haveged.nix
|
./haveged.nix
|
||||||
./monitoring-munin.nix
|
./monitoring-munin.nix
|
||||||
./monitoring-smokeping.nix
|
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
|
|
||||||
# commandées par config-generator
|
# commandées par config-generator
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ mkIf cfg.developpement-haskell {
|
|||||||
|
|
||||||
services.hoogle = {
|
services.hoogle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# port 8080
|
port = 8888;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ mkIf cfg.hydra-core {
|
|||||||
#package = hydra-src-pkg ;
|
#package = hydra-src-pkg ;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.hydra-evaluator.serviceConfig.Nice = -19;
|
||||||
|
|
||||||
#systemd.services.hydra-evaluator = {
|
#systemd.services.hydra-evaluator = {
|
||||||
# path = [ pkgs.nettools config.services.hydra.package ];
|
# path = [ pkgs.nettools config.services.hydra.package ];
|
||||||
#};
|
#};
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ mkIf true {
|
|||||||
address 127.0.0.1
|
address 127.0.0.1
|
||||||
'';
|
'';
|
||||||
extraGlobalConfig = ''
|
extraGlobalConfig = ''
|
||||||
contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" jean-pierre@ocean.prunetwork.fr
|
contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -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 = [
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user