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
@@ -50,15 +50,14 @@ in {
          chmod 600 ${cfg.dataDir}/lightning-charge.db
        fi
        '';
-      serviceConfig = {
+      serviceConfig = nix-bitcoin-services.defaultHardening // {
          PermissionsStartOnly = "true";
          EnvironmentFile = "${config.nix-bitcoin.secretsDir}/lightning-charge-env";
          ExecStart = "${pkgs.nix-bitcoin.lightning-charge}/bin/charged -l ${config.services.clightning.dataDir}/bitcoin -d ${cfg.dataDir}/lightning-charge.db";
          User = user;
          Restart = "on-failure";
          RestartSec = "10s";
-      } // nix-bitcoin-services.defaultHardening
-        // nix-bitcoin-services.nodejs
+      } // nix-bitcoin-services.nodejs
        // nix-bitcoin-services.allowTor;
    };
    nix-bitcoin.secrets.lightning-charge-env.user = user;