feat(config): add config option node.externalAddressFiles
with externalAddressFile you can configure the external address or parts of it through a file(s) instead of putting the host/port into the config file. Motivation: this makes it easier for users to: - hide their host from their config - reuse their config - configure their externalAddress via an external program Example:
"externalAddressesFiles": [
{
"type": "split",
"host": {
"file": "/var/lib/tor/onion/radicle/host"
},
"port": {
"string": "42069"
}
},
{
"type": "full",
"file": "/run/secrets/ext_full_host"
}
]
for more see: https://radicle.zulipchat.com/#narrow/channel/383670-patches/topic/read.20externalAddresses.20from.20external.20file.20instead.20of.20config/with/532591796
9 files changed
+100
-11
54fd8c40
→
7561c869
modified crates/radicle-cli/src/commands/node.rs
@@ -295,7 +295,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-cli/tests/util/environment.rs
@@ -161,7 +161,7 @@ impl Environment {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-node/src/runtime.rs
@@ -176,7 +176,7 @@ impl Runtime {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-node/src/test/environment.rs
@@ -137,7 +137,7 @@ impl Environment {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-node/src/test/peer.rs
@@ -168,7 +168,10 @@ where
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -181,7 +184,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-protocol/src/service.rs
@@ -2476,7 +2476,12 @@ where
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle-protocol/src/service/gossip.rs
@@ -20,7 +20,7 @@ pub fn node(config: &Config, timestamp: Timestamp) -> NodeAnnouncement {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle/src/node/config.rs
@@ -1,7 +1,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -371,6 +371,70 @@ pub enum Relay {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -448,6 +512,9 @@ pub struct Config {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -497,6 +564,7 @@ impl Config {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -529,7 +597,7 @@ impl Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -538,6 +606,19 @@ impl Config {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle/src/profile.rs
@@ -231,7 +231,7 @@ impl Profile {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|