Revert "dnsmasq nixos: make sure it always runs"

This reverts commit 1917e69b546bc357652a3fd888c064e2a1c9fed8.

Changed files
+2 -12
nixos
modules
services
networking
+2 -12
nixos/modules/services/networking/dnsmasq.nix
···
'';
};
-
alwaysKeepRunning = mkOption {
-
type = types.bool;
-
default = false;
-
description = ''
-
If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error.
-
'';
-
};
-
extraConfig = mkOption {
type = types.lines;
default = "";
···
BusName = "uk.org.thekelleys.dnsmasq";
ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-
PrivateTmp = true;
-
ProtectSystem = true;
-
ProtectHome = true;
-
Restart = if cfg.alwaysKeepRunning then "always" else "on-failure";
};
restartTriggers = [ config.environment.etc.hosts.source ];
};
+
};
+
}