Revert "sshguard: make it run"

This reverts commit 69d8b81b4ba613dbf59850b8f32e2d7ddeb133be.
This commit is contained in:
Peter Hoeg 2017-10-14 14:41:48 +08:00
parent 2b5aab4b0f
commit 3211098632

View File

@ -87,21 +87,23 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ];
environment.etc."sshguard.conf".text = let environment.etc."sshguard.conf".text = let
list_services = ( name: "-t ${name} "); list_services = ( name: "-t ${name} ");
in '' in ''
BACKEND="${lib.getBin pkgs.sshguard}/libexec/sshg-fw-ipset" BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"
LOGREADER="LANG=C ${lib.getBin pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat"
''; '';
systemd.services.sshguard = { systemd.services.sshguard =
description = "SSHGuard brute-force attacks protection system"; { description = "SSHGuard brute-force attacks protection system";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
partOf = optional config.networking.firewall.enable "firewall.service"; partOf = optional config.networking.firewall.enable "firewall.service";
path = with pkgs; [ iptables ipset iproute systemd ]; path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ];
postStart = '' postStart = ''
mkdir -p /var/lib/sshguard mkdir -p /var/lib/sshguard
@ -125,11 +127,13 @@ in {
in '' in ''
${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)}
''; '';
PIDFile = "/run/sshguard/sshguard.pid";
Restart = "always"; Restart = "always";
ProtectSystem = true;
PrivateTmp = true; ReadOnlyDirectories = "/";
ReadWriteDirectories = "/run/sshguard /var/lib/sshguard";
RuntimeDirectory = "sshguard"; RuntimeDirectory = "sshguard";
# CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
}; };
}; };
}; };