diff --git a/bin/darkwiki/src/main.rs b/bin/darkwiki/src/main.rs index 6b61e9781..e663b5127 100644 --- a/bin/darkwiki/src/main.rs +++ b/bin/darkwiki/src/main.rs @@ -17,7 +17,7 @@ struct Args { #[structopt(short, parse(from_occurrences))] /// Increase verbosity (-vvv supported) verbose: u8, - #[structopt(short, long, default_value = "tcp://127.0.0.1:13055")] + #[structopt(short, long, default_value = "tcp://127.0.0.1:24330")] /// darkfid JSON-RPC endpoint endpoint: Url, } diff --git a/bin/darkwikid/darkwiki.toml b/bin/darkwikid/darkwiki.toml index 48e02ad9e..1a5f6d455 100644 --- a/bin/darkwikid/darkwiki.toml +++ b/bin/darkwikid/darkwiki.toml @@ -1,5 +1,5 @@ ## JSON-RPC listen URL -#rpc_listen="tcp://127.0.0.1:13055" +#rpc_listen="tcp://127.0.0.1:24330" ## Sets Docs Path # docs="~/darkwiki" @@ -13,19 +13,19 @@ secret = "86MGNN31r3VxT4ULMmhQnMtV8pDnod339KwHwHCfabG2" ## Raft net settings [net] ## P2P accept addresses -inbound=["tls://127.0.0.1:13001"] +inbound = ["tls://127.0.0.1:24331"] ## Connection slots outbound_connections=5 ## P2P external addresses -external_addr=["tls://127.0.0.1:13001"] +external_addr = ["tls://127.0.0.1:24331"] ## Peers to connect to -#peers=["tls://127.0.0.1:13003"] +#peers = ["tls://127.0.0.1:24331"] ## Seed nodes to connect to -#seeds=[] +seeds = ["tls://lilith0.dark.fi:24331", "tls://lilith0.dark.fi:24331"] ## these are the default configuration for the p2p network #manual_attempt_limit=0 @@ -33,4 +33,3 @@ external_addr=["tls://127.0.0.1:13001"] #connect_timeout_seconds=10 #channel_handshake_seconds=4 #channel_heartbeat_seconds=10 - diff --git a/bin/darkwikid/src/main.rs b/bin/darkwikid/src/main.rs index 48be1f513..07a2a33c5 100644 --- a/bin/darkwikid/src/main.rs +++ b/bin/darkwikid/src/main.rs @@ -70,7 +70,7 @@ pub struct Args { #[structopt(long)] pub keygen: bool, /// JSON-RPC Listen URL - #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:13055")] + #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:24330")] pub rpc_listen: Url, #[structopt(flatten)] pub net: SettingsOpt, diff --git a/bin/ircd/ircd_config.toml b/bin/ircd/ircd_config.toml index 8ced83fef..88850b044 100644 --- a/bin/ircd/ircd_config.toml +++ b/bin/ircd/ircd_config.toml @@ -1,5 +1,5 @@ ## JSON-RPC listen URL -#rpc_listen="tcp://127.0.0.1:11055" +#rpc_listen="tcp://127.0.0.1:25550" ## IRC listen URL #irc_listen="tcp://127.0.0.1:6667" @@ -24,20 +24,20 @@ autojoin = ["#dev", "#memes", "#philosophy", "#markets", "#math", "#random"] outbound_connections=5 ## P2P accept addresses -#inbound=["tls://0.0.0.0:11002"] +#inbound = ["tls://0.0.0.0:25551"] # ipv6 version: -#inbound=["tls://[::]:11002"] +#inbound = ["tls://[::]:25551"] ## P2P external addresses ## Put your IPs or hostnames here ## This is how people can reach you on the inbound port configured above ## You can also put an ipv6 address :) -#external_addr=["tls://XXX.XXX.XXX.XXX:11002"] +#external_addr = ["tls://XXX.XXX.XXX.XXX:25551"] # ipv6 version: -#external_addr=["tls://[ipv6 address here]:11002"] +#external_addr = ["tls://[ipv6 address here]:25551"] ## Manually configured peers to connect to -#peers=["tls://127.0.0.1:11003"] +#peers = ["tls://127.0.0.1:25551"] ## Seed nodes to connect to seeds = ["tls://lilith0.dark.fi:25551", "tls://lilith1.dark.fi:25551"] @@ -59,6 +59,9 @@ seeds = ["tls://lilith0.dark.fi:25551", "tls://lilith1.dark.fi:25551"] ## Topic to set for the channel #topic = "DarkFi Foo Stuff" +[channel."#dev"] +topic = "DarkFi Development HQ" + ## Contacts list # Shared secrets that encrypt direct communication between two nicknames on # the network. diff --git a/bin/ircd/src/settings.rs b/bin/ircd/src/settings.rs index c00398632..1b4a9ae3f 100644 --- a/bin/ircd/src/settings.rs +++ b/bin/ircd/src/settings.rs @@ -22,11 +22,11 @@ pub struct Args { pub config: Option, /// JSON-RPC listen URL - #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:11055")] + #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:25550")] pub rpc_listen: Url, /// IRC listen URL - #[structopt(long = "irc", default_value = "tcp://127.0.0.1:11066")] + #[structopt(long = "irc", default_value = "tcp://127.0.0.1:6667")] pub irc_listen: Url, /// Optional TLS certificate file path if `irc_listen` uses TLS diff --git a/bin/tau/tau-cli/src/main.rs b/bin/tau/tau-cli/src/main.rs index 83da3f138..6757e477c 100644 --- a/bin/tau/tau-cli/src/main.rs +++ b/bin/tau/tau-cli/src/main.rs @@ -32,7 +32,7 @@ struct Args { /// Increase verbosity (-vvv supported) verbose: u8, - #[clap(short, long, default_value = "tcp://127.0.0.1:12055")] + #[clap(short, long, default_value = "tcp://127.0.0.1:23330")] /// taud JSON-RPC endpoint endpoint: Url, diff --git a/bin/tau/taud/src/settings.rs b/bin/tau/taud/src/settings.rs index aadc8a8df..78cd7d532 100644 --- a/bin/tau/taud/src/settings.rs +++ b/bin/tau/taud/src/settings.rs @@ -17,7 +17,7 @@ pub struct Args { #[structopt(long)] pub config: Option, /// JSON-RPC listen URL - #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:12055")] + #[structopt(long = "rpc", default_value = "tcp://127.0.0.1:23330")] pub rpc_listen: Url, /// Sets Datastore Path #[structopt(long, default_value = "~/.config/darkfi/tau")] diff --git a/bin/tau/taud_config.toml b/bin/tau/taud_config.toml index 6701f18c1..d13f6ab73 100644 --- a/bin/tau/taud_config.toml +++ b/bin/tau/taud_config.toml @@ -1,5 +1,5 @@ ## JSON-RPC listen URL -#rpc_listen="tcp://127.0.0.1:12055" +#rpc_listen="tcp://127.0.0.1:23330" ## Sets Datastore Path #datastore="~/.config/darkfi/tau" @@ -10,16 +10,16 @@ ## Raft net settings [net] ## P2P accept addresses -#inbound=["tcp://127.0.0.1:12002"] +#inbound = ["tcp://127.0.0.1:23331"] ## Connection slots outbound_connections=5 ## P2P external addresses -#external_addr=["tls://127.0.0.1:12002"] +#external_addr = ["tls://127.0.0.1:23331"] ## Peers to connect to -#peers=["tls://127.0.0.1:12003"] +#peers = ["tls://127.0.0.1:23331"] ## Seed nodes to connect to seeds=["tls://lilith0.dark.fi:23331", "tls://lilith1.dark.fi:23331"] @@ -35,6 +35,7 @@ seeds=["tls://lilith0.dark.fi:23331", "tls://lilith1.dark.fi:23331"] [workspace."darkfi"] ## Create with `taud --key-gen` secret = "7CkVuFgwTUpJn5Sv67Q3fyEDpa28yrSeL5Hg2GqQ4jfM" + [workspace."general"] ## Create with `taud --key-gen` secret = "6ZkvojUcSRML7wSGc3AMmM5meyyEXLoykT23cyUUB6GM"