Compare commits

..

5 Commits

6 changed files with 36 additions and 8 deletions

View File

@@ -43,9 +43,8 @@ show-roots:
nix-store --gc --print-roots nix-store --gc --print-roots
show-time: show-time:
-@$(CHRONY_STATUS) -@$(CHRONY_STATUS) && $(CHRONY_STATS)
#CHRONY_STATUS='chronyc tracking' CHRONY_STATS='chronyc sources -v' ${CHRONY_STATS} && watch -d -n 20 "${CHRONY_STATUS} && echo "--" && ${CHRONY_STATS}" -@watch -d -n 5 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS)"
-@watch -d -n 20 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS)"
store-repair: store-repair:
$(TIME) nix-store --verify --check-contents --repair $(TIME) nix-store --verify --check-contents --repair

View File

@@ -21,7 +21,7 @@ environment.systemPackages = with pkgs; [
clawsMail clawsMail
hexchat hexchat
quasselClient quasselClient
mumble #mumble
pidgin pidgin
thunderbird thunderbird

View File

@@ -22,4 +22,11 @@ mkIf true {
allowedUDPPorts = [ allowedUDPPorts = [
]; ];
}; };
} // {
assertions = [
{
assertion = true;
message = "Assetion toujours valide.";
}
];
} }

View File

@@ -62,10 +62,10 @@ let
configurationOptions = { configurationOptions = {
ipAddress = mkOption { ipAddress = mkOption {
description = "Adresse IP"; description = "Adresse IP.";
type = lib.types.string; type = lib.types.string;
}; };
nix-serve-server = mkEnableOption "nix-serve server"; nix-serve-server = mkEnableOption "nix-serve server.";
nix-serve-client = { nix-serve-client = {
enable = mkEnableOption "nix-serve client"; enable = mkEnableOption "nix-serve client";
servers = mkOption { servers = mkOption {
@@ -76,7 +76,7 @@ let
}; };
tinc = { tinc = {
enable = mkEnableOption "Enable tinc service"; enable = mkEnableOption "Enable tinc service.";
dnsFQDN = mkOption { dnsFQDN = mkOption {
example = "device.example.net."; example = "device.example.net.";
description = "DNS name of host pointing to tunnel IP."; description = "DNS name of host pointing to tunnel IP.";

View File

@@ -48,9 +48,22 @@ mkIf flags.munin {
hosts = '' hosts = ''
[${config.networking.hostName}] [${config.networking.hostName}]
address 127.0.0.1 address 127.0.0.1
df._dev_sda2.warning 35
use_node_name yes
#contacts syslog
contacts email
''; '';
# http://sametmax.com/monitorez-vos-serveurs-avec-munin-et-notifications-par-email/
# http://guide.munin-monitoring.org/en/latest/tutorial/alert.html#syntax-of-warning-and-critical
extraGlobalConfig = '' extraGlobalConfig = ''
contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr #---
#contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr
contact.email.command /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr
contact.syslog.command /run/current-system/sw/bin/logger -p user.crit -t "Munin notification for ${config.networking.hostName}"
#---
contact.email.always_send ok,warning,critical,unknown
contact.syslog.always_send ok,warning,critical,unknown
''; '';
}; };

View File

@@ -11,11 +11,20 @@ mkIf flags.scanner {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Driver
hplip # Scanner HP
python27Packages.pyqt4 # dépendance hplip
# Outils pour exploiter les scanners
simple-scan simple-scan
]; ];
# Services # Services
hardware.sane.enable = true; hardware.sane.enable = true;
services.saned = {
enable = true;
extraConfig = "192.168.0.0/24";
};
# Réseau # Réseau
networking.firewall = { networking.firewall = {