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
@@ -91,14 +91,13 @@ in {
        chmod u=rw,g=r,o= ${cfg.dataDir}/lnd.conf
        echo "bitcoind.rpcpass=$(cat ${secretsDir}/bitcoin-rpcpassword)" >> '${cfg.dataDir}/lnd.conf'
      '';
-      serviceConfig = {
+      serviceConfig = nix-bitcoin-services.defaultHardening // {
        PermissionsStartOnly = "true";
        ExecStart = "${cfg.package}/bin/lnd --configfile=${cfg.dataDir}/lnd.conf";
        User = "lnd";
        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
        ) // nix-bitcoin-services.allowAnyProtocol;  # For ZMQ