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
@@ -74,7 +74,7 @@ in {
        echo "cookie = \"${config.services.bitcoind.rpcuser}:$(cat ${secretsDir}/bitcoin-rpcpassword)\"" \
          > electrs.toml
        '';
-      serviceConfig = {
+      serviceConfig = nix-bitcoin-services.defaultHardening // {
        RuntimeDirectory = "electrs";
        RuntimeDirectoryMode = "700";
        WorkingDirectory = "/run/electrs";
@@ -96,8 +96,7 @@ in {
        Group = cfg.group;
        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
        );