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
@@ -71,14 +71,13 @@ in {
      wantedBy = [ "multi-user.target" ];
      requires = [ "clightning.service" ] ++ onion-chef-service;
      after = [ "clightning.service" ]  ++ onion-chef-service;
-      serviceConfig = {
+      serviceConfig = nix-bitcoin-services.defaultHardening // {
        PermissionsStartOnly = "true";
        ExecStart = "${pkgs.bash}/bin/bash ${run-spark-wallet}";
        User = "spark-wallet";
        Restart = "on-failure";
        RestartSec = "10s";
-      } // nix-bitcoin-services.defaultHardening
-        // nix-bitcoin-services.nodejs
+      } // nix-bitcoin-services.nodejs
        // nix-bitcoin-services.allowTor;
    };
    nix-bitcoin.secrets.spark-wallet-login.user = "spark-wallet";