mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #298336 from flokli/mycelium-description-fixes
nixos/mycelium: description updates
This commit is contained in:
commit
91a24793e3
|
@ -9,17 +9,23 @@ in
|
||||||
peers = lib.mkOption {
|
peers = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.str;
|
type = lib.types.listOf lib.types.str;
|
||||||
description = ''
|
description = ''
|
||||||
List of peers to connect to in the format quic://1.2.3.4:9651.
|
List of peers to connect to, in the formats:
|
||||||
If addHostedPublicNodes is set to true, the hosted public nodes will be added to this list.
|
- `quic://[2001:0db8::1]:9651`
|
||||||
|
- `quic://192.0.2.1:9651`
|
||||||
|
- `tcp://[2001:0db8::1]:9651`
|
||||||
|
- `tcp://192.0.2.1:9651`
|
||||||
|
|
||||||
|
If addHostedPublicNodes is set to true, the hosted public nodes will also be added.
|
||||||
'';
|
'';
|
||||||
default = [];
|
default = [ ];
|
||||||
};
|
};
|
||||||
keyFile = lib.mkOption {
|
keyFile = lib.mkOption {
|
||||||
type = lib.types.nullOr lib.types.path;
|
type = lib.types.nullOr lib.types.path;
|
||||||
default = null;
|
default = null;
|
||||||
description = ''
|
description = ''
|
||||||
optional path to a keyFile, if unset the default location (/var/lib/mycelium/key) will be used
|
Optional path to a file containing the mycelium key material.
|
||||||
If this key does not exist, it will be generated
|
If unset, the default location (`/var/lib/mycelium/key.bin`) will be used.
|
||||||
|
If no key exist at this location, it will be generated on startup.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
openFirewall = lib.mkOption {
|
openFirewall = lib.mkOption {
|
||||||
|
@ -37,7 +43,7 @@ in
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
description = ''
|
description = ''
|
||||||
add the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes
|
Adds the hosted peers from https://github.com/threefoldtech/mycelium#hosted-public-nodes.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -79,9 +85,10 @@ in
|
||||||
"--key-file \${CREDENTIALS_DIRECTORY}/keyfile" else
|
"--key-file \${CREDENTIALS_DIRECTORY}/keyfile" else
|
||||||
"--key-file %S/mycelium/key.bin"
|
"--key-file %S/mycelium/key.bin"
|
||||||
)
|
)
|
||||||
"--tun-name" "mycelium"
|
"--tun-name"
|
||||||
|
"mycelium"
|
||||||
] ++
|
] ++
|
||||||
(lib.optional (cfg.addHostedPublicNodes || cfg.peers != []) "--peers")
|
(lib.optional (cfg.addHostedPublicNodes || cfg.peers != [ ]) "--peers")
|
||||||
++ cfg.peers ++ (lib.optionals cfg.addHostedPublicNodes [
|
++ cfg.peers ++ (lib.optionals cfg.addHostedPublicNodes [
|
||||||
"tcp://188.40.132.242:9651" # DE 01
|
"tcp://188.40.132.242:9651" # DE 01
|
||||||
"tcp://[2a01:4f8:221:1e0b::2]:9651"
|
"tcp://[2a01:4f8:221:1e0b::2]:9651"
|
||||||
|
|
Loading…
Reference in a new issue