From bdac23092ae70bd5fcf13703825d8ab9286e0caa Mon Sep 17 00:00:00 2001
From: notplants <max@mfowler.info>
Date: Thu, 7 Jul 2022 10:41:36 +0200
Subject: [PATCH] Change changepassword to change-password

---
 Cargo.lock               | 27 +++++++++++++++++++++++----
 peach-config/Cargo.toml  |  2 +-
 peach-config/src/main.rs |  2 +-
 peach-lib/Cargo.toml     |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bfaf051..76080e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1079,7 +1079,26 @@ dependencies = [
 [[package]]
 name = "golgi"
 version = "0.1.4"
-source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#ca4c1114ddf328b818144c5a1af0187b1357e9be"
+source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#ca4c1114ddf328b818144c5a1af0187b1357e9be"
+dependencies = [
+ "async-std",
+ "async-stream 0.3.3",
+ "base64 0.13.0",
+ "futures 0.3.21",
+ "hex",
+ "kuska-handshake",
+ "kuska-sodiumoxide",
+ "kuska-ssb",
+ "log 0.4.17",
+ "serde 1.0.137",
+ "serde_json",
+ "sha2",
+]
+
+[[package]]
+name = "golgi"
+version = "0.1.5"
+source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git?branch=dev#414e8869f91974ae88431d74a8c8138e0a0ccdc6"
 dependencies = [
  "async-std",
  "async-stream 0.3.3",
@@ -2205,7 +2224,7 @@ dependencies = [
  "async-std",
  "clap",
  "env_logger 0.6.2",
- "golgi",
+ "golgi 0.1.5",
  "lazy_static",
  "log 0.4.17",
  "peach-lib",
@@ -2247,7 +2266,7 @@ dependencies = [
  "chrono",
  "dirs 4.0.0",
  "fslock",
- "golgi",
+ "golgi 0.1.5",
  "jsonrpc-client-core",
  "jsonrpc-client-http",
  "jsonrpc-core 8.0.1",
@@ -2341,7 +2360,7 @@ dependencies = [
  "dirs 4.0.0",
  "env_logger 0.8.4",
  "futures 0.3.21",
- "golgi",
+ "golgi 0.1.4",
  "lazy_static",
  "log 0.4.17",
  "maud",
diff --git a/peach-config/Cargo.toml b/peach-config/Cargo.toml
index ee34f61..fca5f35 100644
--- a/peach-config/Cargo.toml
+++ b/peach-config/Cargo.toml
@@ -37,5 +37,5 @@ log = "0.4"
 lazy_static = "1.4.0"
 peach-lib = { path = "../peach-lib" }
 rpassword = "5.0"
-golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
+golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git", branch = "dev" }
 async-std = "1.10.0"
diff --git a/peach-config/src/main.rs b/peach-config/src/main.rs
index 289b7ff..2fd7624 100644
--- a/peach-config/src/main.rs
+++ b/peach-config/src/main.rs
@@ -46,7 +46,7 @@ enum PeachConfig {
     Update(UpdateOpts),
 
     /// Changes the password for the peach-web interface
-    #[structopt(name = "changepassword")]
+    #[structopt(name = "change-password")]
     ChangePassword(ChangePasswordOpts),
 
     /// Updates file permissions on PeachCloud device
diff --git a/peach-lib/Cargo.toml b/peach-lib/Cargo.toml
index ee14e50..5228801 100644
--- a/peach-lib/Cargo.toml
+++ b/peach-lib/Cargo.toml
@@ -9,7 +9,7 @@ async-std = "1.10"
 chrono = "0.4"
 dirs = "4.0"
 fslock="0.1"
-golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi" }
+golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git", branch = "dev" }
 jsonrpc-client-core = "0.5"
 jsonrpc-client-http = "0.5"
 jsonrpc-core = "8.0"