diff --git a/os/host/dev/seed/radicle.nix b/os/host/dev/seed/radicle.nix index 93ac251..a4391a8 100644 --- a/os/host/dev/seed/radicle.nix +++ b/os/host/dev/seed/radicle.nix @@ -12,11 +12,6 @@ services.radicle = { httpd.nginx.serverAliases = ["seed.radicle.xyz"]; - settings = { - fetch.signedReferences.featureLevel.minimum = "parent"; - node.externalAddresses = lib.mkAfter [ - "seedradanrg2oje34eyidx4z63gpuakgaedaetvt7xxw5whv6qnexmid.onion:58776" - ]; - }; + settings.fetch.signedReferences.featureLevel.minimum = "parent"; }; } diff --git a/os/host/dev/seed/tor.nix b/os/host/dev/seed/tor.nix index c05eb09..069318e 100644 --- a/os/host/dev/seed/tor.nix +++ b/os/host/dev/seed/tor.nix @@ -1,6 +1,9 @@ -let +{lib, ...}: let secret = "tor/hs_ed25519_secret_key"; in { imports = [../../../mixin/tor.nix]; sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json; + services.radicle.settings.node.externalAddresses = lib.mkAfter [ + "seedradanrg2oje34eyidx4z63gpuakgaedaetvt7xxw5whv6qnexmid.onion:58776" + ]; } diff --git a/os/host/network/iris/radicle.nix b/os/host/network/iris/radicle.nix index b206dd9..c5f4baa 100644 --- a/os/host/network/iris/radicle.nix +++ b/os/host/network/iris/radicle.nix @@ -20,7 +20,6 @@ httpd.nginx.serverAliases = ["seed.radicle.garden" "iris.radicle.xyz" "iris.radicle.network"]; settings.node.externalAddresses = lib.mkAfter [ "iris.radicle.xyz:58776" - "irisradizskwweumpydlj4oammoshkxxjur3ztcmo7cou5emc6s5lfid.onion:58776" ]; }; } diff --git a/os/host/network/iris/tor.nix b/os/host/network/iris/tor.nix index c05eb09..9d46b2b 100644 --- a/os/host/network/iris/tor.nix +++ b/os/host/network/iris/tor.nix @@ -1,6 +1,9 @@ -let +{lib, ...}: let secret = "tor/hs_ed25519_secret_key"; in { imports = [../../../mixin/tor.nix]; sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json; + services.radicle.settings.node.externalAddresses = lib.mkAfter [ + "irisradizskwweumpydlj4oammoshkxxjur3ztcmo7cou5emc6s5lfid.onion:58776" + ]; } diff --git a/os/host/network/rosa/radicle.nix b/os/host/network/rosa/radicle.nix index 24b4e1e..530bba9 100644 --- a/os/host/network/rosa/radicle.nix +++ b/os/host/network/rosa/radicle.nix @@ -20,7 +20,6 @@ httpd.nginx.serverAliases = ["ash.radicle.garden" "rosa.radicle.xyz" "rosa.radicle.network"]; settings.node.externalAddresses = lib.mkAfter [ "rosa.radicle.xyz:58776" - "rosarad5bxgdlgjnzzjygnsxrwxmoaj4vn7xinlstwglxvyt64jlnhyd.onion:58776" ]; }; } diff --git a/os/host/network/rosa/tor.nix b/os/host/network/rosa/tor.nix index c05eb09..8fb7062 100644 --- a/os/host/network/rosa/tor.nix +++ b/os/host/network/rosa/tor.nix @@ -1,6 +1,9 @@ -let +{lib, ...}: let secret = "tor/hs_ed25519_secret_key"; in { imports = [../../../mixin/tor.nix]; sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json; + services.radicle.settings.node.externalAddresses = lib.mkAfter [ + "rosarad5bxgdlgjnzzjygnsxrwxmoaj4vn7xinlstwglxvyt64jlnhyd.onion:58776" + ]; }