diff options
| -rw-r--r-- | nixos/modules/services/misc/rippled.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/rippled/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 03fcc003a404..045330eb5513 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -27,7 +27,7 @@ let protocol=${concatStringsSep "," p.protocol} ${optionalString (p.user != "") "user=${p.user}"} ${optionalString (p.password != "") "user=${p.password}"} - admin=${if p.admin then "allow" else "no"} + admin=${concatStringsSep "," p.admin} ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} @@ -118,9 +118,9 @@ let }; admin = mkOption { - description = "Controls whether or not administrative commands are allowed."; - type = types.bool; - default = false; + description = "A comma-separated list of admin IP addresses."; + type = types.listOf types.str; + default = ["127.0.0.1"]; }; ssl = { @@ -156,7 +156,7 @@ let dbOptions = { type = mkOption { description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"]; + type = types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; @@ -217,7 +217,7 @@ in default = { rpc = { port = 5005; - admin = true; + admin = ["127.0.0.1"]; protocol = ["http"]; }; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 6a09d683f8d1..99a6879ab925 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.27.4"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3"; + sha256 = "0wh8dwdg0gp7smcx40cpqanl2m2hihmx3irqh692svakbl3df3vz"; }; postPatch = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; - buildPhase = "scons build/rippled"; + buildPhase = "scons"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0a8f47d34d..85d8eb924b50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8988,7 +8988,7 @@ let }; rippled = callPackage ../servers/rippled { - boost = boost155; + boost = boost157; }; ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; |