From dd914c7ecf1e61269b888b4501db2bc88f08bdc1 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Wed, 2 Jul 2025 21:39:36 +0300
Subject: [PATCH] Fix to partially revert a fix to enable log rotation for
 Webmin logs

This reverts commit 58580b7f4b17b76cdb37466feee44ffc284116db.

https://github.com/webmin/webmin/commit/58580b7f4b17b76cdb37466feee44ffc284116db#r161290315
---
 setup.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup.sh b/setup.sh
index 9f825dd2b..c0dbc0d48 100755
--- a/setup.sh
+++ b/setup.sh
@@ -829,11 +829,12 @@ if [ "$upgrading" != 1 ]; then
 	# Disallow unknown referers by default
 	echo "referers_none=1" >>$config_dir/config
 else
-	# Enable log rotation if not set
-	grep logclear= $config_dir/miniserv.conf >/dev/null
-	if [ "$?" != "0" ]; then
-		echo "logclear=1" >> $config_dir/miniserv.conf
-		echo "logclear=1" >> $config_dir/config
+	# one-off hack to set log variable in config from miniserv.conf
+	grep log= $config_dir/config >/dev/null
+	if [ "$?" = "1" ]; then
+		grep log= $config_dir/miniserv.conf >> $config_dir/config
+		grep logtime= $config_dir/miniserv.conf >> $config_dir/config
+		grep logclear= $config_dir/miniserv.conf >> $config_dir/config
 	fi
 
 	# Enable HSTS by default if not set