about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-10-14 14:42:29 +0800
committerPeter Hoeg <peter@hoeg.com>2017-10-14 14:42:49 +0800
commitbdbba026f3f98e26509c21823a00de99af78b9c1 (patch)
tree4e13cd8f5f6c74f0963ece3613266b4a9fb8d04f /nixos/modules
parente01bb0c0d05e29b764fa090d85ec5babd03c84b8 (diff)
downloadnixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar.gz
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar.bz2
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar.lz
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar.xz
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.tar.zst
nixlib-bdbba026f3f98e26509c21823a00de99af78b9c1.zip
Revert "dnsmasq nixos: make sure it always runs"
This reverts commit 1917e69b546bc357652a3fd888c064e2a1c9fed8.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/dnsmasq.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 91a3e54474ac..fcf5aa5f175b 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -55,14 +55,6 @@ in
         '';
       };
 
-      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 = "";
@@ -109,12 +101,10 @@ in
           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 ];
     };
+
   };
+
 }