From 114d55fc39fd9a7a07f297174a5d91c90730ec59 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 5 Nov 2020 11:17:17 +0100
Subject: [dnbd3-proxy-mode] Honor config overrides from SLX_DNBD3_EXTRA

Closes #3328
---
 .../data/opt/openslx/scripts/systemd-setup_dnbd3_proxy        | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'core/modules/dnbd3-proxy-mode')

diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
index 589e43ba..e45272a6 100755
--- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
+++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
@@ -238,6 +238,7 @@ clientPenalty=0
 isProxy=true
 backgroundReplication=${DNBD3_BGR}
 bgrMinClients=${DNBD3_BGR_MIN_CLIENTS}
+bgrWindowSize=1
 lookupMissingForProxy=${DNBD3_LOOKUP}
 sparseFiles=${DNBD3_SPARSE}
 removeMissingImages=false
@@ -247,12 +248,22 @@ pretendClient=${DNBD3_PRETEND_CLIENT}
 autoFreeDiskSpaceDelay=${DNBD3_AUTOFREE}
 
 [limits]
+maxPayload=10M
 maxReplicationSize=${MAX_REPLICATION_SIZE}G
 
 [logging]
 consoleMask=ERROR WARNING MINOR INFO
 EOF
 
+# Extra overrides - make this proerly ini aware some day. For now we don't
+# have any name clashes between the ini sections so this works
+for item in $SLX_DNBD3_EXTRA; do # space sep
+	item="${item#*.}"
+	key="${item%%=*}"
+	val="${item#*=}"
+	sed -i "s/^${key}=.*$/${key}=${val}/" "${DNBD3_CONF_DIR}/server.conf"
+done
+
 # To this day, only the sat IP is in SLX_KCL_SERVERS afaik
 [ -z "${FOUND_SAT}" ] && add_alt_server ${SLX_KCL_SERVERS}
 chmod -R a+Xr "${DNBD3_CONF_DIR}"
-- 
cgit v1.2.3-55-g7522