Allow to set Roundcube product_name setting using ROUNDCUBE_PRODUCT_NAME

msimerson · Nov 25, 2022 · d894517 · d894517
1 parent 9d7783d
commit d894517
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/include/php.sh b/include/php.sh
@@ -121,3 +121,8 @@ test_php_fpm()
 		fi
 	fi
 }
+
+php_quote()
+{
+	stage_exec php -r 'var_export($argv[1]);' "$1"
+}
diff --git a/mail-toaster.sh b/mail-toaster.sh
@@ -5,6 +5,8 @@ mt6_version() { echo "20220621"; }
 
 dec_to_hex() { printf '%04x\n' "$1"; }
 
+sed_replacement_quote() { printf "%s" "$1" | sed 's,[&\\/],\\\1,g'; }
+
 get_random_ip6net()
 {
 	# shellcheck disable=2039
@@ -57,6 +59,7 @@ export TOASTER_MARIADB="0"
 export TOASTER_PKG_AUDIT="0"
 export ROUNDCUBE_SQL="0"
 export ROUNDCUBE_DEFAULT_HOST=""
+export ROUNDCUBE_PRODUCT_NAME="Roundcube Webmail"
 export SQUIRREL_SQL="0"
 export TOASTER_NRPE=""
 export TOASTER_MUNIN=""
@@ -143,6 +146,7 @@ export TOASTER_MYSQL=${TOASTER_MYSQL:="1"}
 export TOASTER_MARIADB=${TOASTER_MARIADB:="0"}
 export SQUIRREL_SQL=${SQUIRREL_SQL:="$TOASTER_MYSQL"}
 export ROUNDCUBE_SQL=${ROUNDCUBE_SQL:="$TOASTER_MYSQL"}
+export ROUNDCUBE_PRODUCT_NAME=${ROUNDCUBE_PRODUCT_NAME:="Roundcube Webmail"}
 export TOASTER_NTP=${TOASTER_NTP:="ntp"}
 export TOASTER_MSA=${TOASTER_MSA:="haraka"}
 

diff --git a/provision/roundcube.sh b/provision/roundcube.sh
@@ -152,6 +152,7 @@ configure_roundcube()
 		-e "/'smtp_user'/    s/'';/'%u';/" \
 		-e "/'smtp_pass'/    s/'';/'%p';/" \
 		-e "/'archive',/     s/,$/, 'managesieve',/" \
+		-e "/'product_name'/ s/'Roundcube Webmail'/$(sed_replacement_quote "$(php_quote "$ROUNDCUBE_PRODUCT_NAME")")/" \
 		"$_rcc_conf"
 
 	tee -a "$_rcc_conf" <<'EO_RC_ADD'
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,3 +121,8 @@ test_php_fpm() @@
     		fi
     	fi
     }
+    php_quote()
+    {
+    	stage_exec php -r 'var_export($argv[1]);' "$1"
+    }