From 50dcb2cf9ea0fe947c7c7ffc3859c85c90b752d5 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 15 Jun 2022 08:58:21 +0100 Subject: [PATCH 1/3] add checkbox to enable / disable ebt --- peach-web/src/routes/settings/scuttlebutt/configure.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/peach-web/src/routes/settings/scuttlebutt/configure.rs b/peach-web/src/routes/settings/scuttlebutt/configure.rs index 1a03187..dcba7b4 100644 --- a/peach-web/src/routes/settings/scuttlebutt/configure.rs +++ b/peach-web/src/routes/settings/scuttlebutt/configure.rs @@ -122,6 +122,15 @@ pub fn build_template(request: &Request) -> PreEscaped { input type="text" id="database_dir" name="repo" value=(sbot_config.repo); } div class="center" { + @if sbot_config.enable_ebt { + input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt" checked; + } @else { + input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt"; + } + label class="font-normal" for="ebtReplication" title="Enable Epidemic Broadcast Tree (EBT) replication instead of legacy replication" { + "Enable EBT Replication" + } + br; @if sbot_config.localadv { input type="checkbox" id="lanBroadcast" style="margin-bottom: 1rem;" name="localadv" checked; } @else { @@ -157,7 +166,6 @@ pub fn build_template(request: &Request) -> PreEscaped { input type="hidden" id="hmac" name="hmac" value=(sbot_config.hmac); input type="hidden" id="wslis" name="wslis" value=(sbot_config.wslis); input type="hidden" id="debuglis" name="debuglis" value=(sbot_config.debuglis); - input type="hidden" id="enable_ebt" name="enable_ebt" value=(sbot_config.enable_ebt); input type="hidden" id="promisc" name="promisc" value=(sbot_config.promisc); input type="hidden" id="nounixsock" name="nounixsock" value=(sbot_config.nounixsock); (PreEscaped("")) From 218a70b8f804c1f6f6725ed8f06e748f68289832 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 15 Jun 2022 08:58:45 +0100 Subject: [PATCH 2/3] add lockfile --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 32c6254..90ce926 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1111,7 +1111,7 @@ dependencies = [ [[package]] name = "golgi" version = "0.1.1" -source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#0aa616d92b005b38359aa34bf448f3f1f47e8e6a" +source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#0aa616d92b005b38359aa34bf448f3f1f47e8e6a" dependencies = [ "async-std", "async-stream 0.3.3", From 56fafc8d6715d26a5f64c8014ba4ee20754d9abb Mon Sep 17 00:00:00 2001 From: glyph Date: Thu, 16 Jun 2022 11:41:50 +0100 Subject: [PATCH 3/3] bump manifest version and add max as author --- peach-web/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peach-web/Cargo.toml b/peach-web/Cargo.toml index 94a7160..7afc5f7 100644 --- a/peach-web/Cargo.toml +++ b/peach-web/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "peach-web" -version = "0.6.15" -authors = ["Andrew Reid "] +version = "0.6.16" +authors = ["Andrew Reid ", "Max Fowler "] edition = "2018" description = "peach-web is a web application which provides a web interface for monitoring and interacting with the PeachCloud device. This allows administration of the single-board computer (ie. Raspberry Pi) running PeachCloud, as well as the ssb-server and related plugins." homepage = "https://opencollective.com/peachcloud"