greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #112: Minor improvements

Browse Source 
161ee02550 style: remove extra space (Ștefan D. Mihăilă)
4e6e05a4a8 Improve electrs ports descriptions (Ștefan D. Mihăilă)
cd722cac1a Fix identation (Ștefan D. Mihăilă)
df784b341e Expose electrs high-memory option in configuration.nix (Ștefan D. Mihăilă)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 161ee02550

Tree-SHA512: c730b6979f28f8a26a1a10d47aeb0eaf4a41343b058c271a2710c27c171bf521f64358be1fedafeefb30bb2cdafb37a8665c0292e8cd673eeb575f3afbc8919e
This commit is contained in:
Jonas Nick 2019-08-18 15:45:46 +00:00
commit 08067a68ab
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -41,6 +41,8 @@
# Electrum Server in Rust. Only enable this if hardware wallets are # Electrum Server in Rust. Only enable this if hardware wallets are
# disabled. # disabled.
# services.electrs.enable = true; # services.electrs.enable = true;
# If you have ≥8GB memory, enable this option so electrs will sync faster.
# services.electrs.high-memory = true;
### LIQUIDD ### LIQUIDD
# Enable this module to use Liquid, a sidechain for an inter-exchange # Enable this module to use Liquid, a sidechain for an inter-exchange

8
modules/electrs.nix
View File

@ -41,19 +41,19 @@ in {
port = mkOption { port = mkOption {
type = types.ints.u16; type = types.ints.u16;
default = 50001; default = 50001;
description = "Override the default port on which to listen for connections."; description = "RPC port.";
}; };
onionport = mkOption { onionport = mkOption {
type = types.ints.u16; type = types.ints.u16;
default = 50002; default = 50002;
description = "Override the default port on which to listen for connections."; description = "Port on which to listen for tor client connections.";
}; };
nginxport = mkOption { nginxport = mkOption {
type = types.ints.u16; type = types.ints.u16;
default = 50003; default = 50003;
description = "Override the default port on which to listen for connections."; description = "Port on which to listen for TLS client connections.";
}; };
enforceTor = nix-bitcoin-services.enforceTor; enforceTor = nix-bitcoin-services.enforceTor;
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {

16
modules/nix-bitcoin-services.nix
View File

@ -32,14 +32,14 @@ in
# Allow any traffic # Allow any traffic
allowAnyIP = { IPAddressAllow = "any"; }; allowAnyIP = { IPAddressAllow = "any"; };
enforceTor = mkOption { enforceTor = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
"Whether to force Tor on a service by only allowing connections from and "Whether to force Tor on a service by only allowing connections from and
to 127.0.0.1;"; to 127.0.0.1;";
''; '';
}; };
} }

1
modules/nix-bitcoin.nix
View File

@ -161,7 +161,6 @@ in {
services.electrs.enforceTor = true; services.electrs.enforceTor = true;
services.electrs.onionport = 50002; services.electrs.onionport = 50002;
services.electrs.nginxport = 50003; services.electrs.nginxport = 50003;
services.electrs.high-memory = false;
services.tor.hiddenServices.electrs = { services.tor.hiddenServices.electrs = {
map = [{ map = [{
port = config.services.electrs.onionport; toPort = config.services.electrs.nginxport; port = config.services.electrs.onionport; toPort = config.services.electrs.nginxport;