All modules: Give service config precedence over defaultHardening

With '//' the latter takes precedence over the former in case of equally named attributes.
2020-05-22 08:08:27 +00:00
parent 0ac1e496b2
commit 7c70dd43ac
11 changed files with 24 additions and 35 deletions
@@ -81,15 +81,14 @@ in {
        jq
        sudo
      ];
-      serviceConfig = {
+      serviceConfig = nix-bitcoin-services.defaultHardening // {
        ExecStart="${pkgs.bash}/bin/bash ${createWebIndex}";
        User = "root";
        Type = "simple";
        RemainAfterExit="yes";
        Restart = "on-failure";
        RestartSec = "10s";
-      } // nix-bitcoin-services.defaultHardening
-        // (if cfg.enforceTor
+      } // (if cfg.enforceTor
          then nix-bitcoin-services.allowTor
          else nix-bitcoin-services.allowAnyIP
        );