From 5a9827deed90abee54d3f132446ec551afdb704e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 1 Jul 2025 04:51:17 +0300 Subject: [PATCH] fix: remove cardano.node.configPath setting --- modules/kupo.nix | 1 - modules/node.nix | 6 ------ modules/ogmios.nix | 1 - modules/services/ogmios.nix | 1 + 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/kupo.nix b/modules/kupo.nix index 9a030ac..f72d9c1 100644 --- a/modules/kupo.nix +++ b/modules/kupo.nix @@ -15,7 +15,6 @@ in services.kupo = { enable = true; nodeSocketPath = lib.mkIf (config.cardano.node.enable or false) config.cardano.node.socketPath; - nodeConfigPath = lib.mkIf (config.cardano.node.enable or false) config.cardano.node.configPath; ogmiosHost = lib.mkIf (config.cardano.ogmios.enable or false) "127.0.0.1"; ogmiosPort = lib.mkIf (config.cardano.ogmios.enable or false) config.services.ogmios.port; }; diff --git a/modules/node.nix b/modules/node.nix index ee1e9c4..bfda76c 100644 --- a/modules/node.nix +++ b/modules/node.nix @@ -23,12 +23,6 @@ in default = "/run/cardano-node/node.socket"; }; - configPath = lib.mkOption { - description = "Path to cardano-node configuration."; - type = lib.types.path; - default = "/etc/cardano-node/config.json"; - }; - copyCardanoNodeConfigToEtc = lib.mkOption { description = "If set to true, this will -- at Nix evaluation time -- copy the cardano node's config file to `/etc/cardano-node/config.json`"; type = lib.types.bool; diff --git a/modules/ogmios.nix b/modules/ogmios.nix index 5dd6e11..cbafd51 100644 --- a/modules/ogmios.nix +++ b/modules/ogmios.nix @@ -15,7 +15,6 @@ in services.ogmios = { enable = true; nodeSocketPath = lib.mkIf (config.cardano.node.enable or false) config.cardano.node.socketPath or null; - nodeConfigPath = lib.mkIf (config.cardano.node.enable or false) config.cardano.node.configPath or null; }; systemd.services.ogmios = lib.mkIf (config.cardano.node.enable or false) { diff --git a/modules/services/ogmios.nix b/modules/services/ogmios.nix index 180fb9e..69fa12a 100644 --- a/modules/services/ogmios.nix +++ b/modules/services/ogmios.nix @@ -40,6 +40,7 @@ in nodeConfigPath = mkOption { description = "Path to cardano-node config.json file. Required."; type = path; + default = "/etc/cardano-node/config.json"; }; host = mkOption {