Skip to content

Commit 47cda0f

Browse files
authored
Merge pull request hestiacp#1841 from jaapmarcus/fix/proxy-extentions
Leave proxy_extentions replacement in the system
2 parents dcdef29 + eac319a commit 47cda0f

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

func/domain.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,11 @@ add_web_config() {
231231
WEBTPL_LOCATION="$WEBTPL/$1/$WEB_BACKEND"
232232
fi
233233
fi
234-
234+
235+
# Note: Removing or renaming template variables will lead to broken custom templates.
236+
# -If possible custom templates should be automatically upgraded to use the new format
237+
# -Alternatively a depreciation period with proper notifications should be considered
238+
235239
cat "${WEBTPL_LOCATION}/$2" | \
236240
sed -e "s|%ip%|$local_ip|g" \
237241
-e "s|%domain%|$domain|g" \
@@ -248,6 +252,7 @@ add_web_config() {
248252
-e "s|%proxy_system%|$PROXY_SYSTEM|g" \
249253
-e "s|%proxy_port%|$PROXY_PORT|g" \
250254
-e "s|%proxy_ssl_port%|$PROXY_SSL_PORT|g" \
255+
-e "s/%proxy_extentions%/${PROXY_EXT//,/|}/g" \
251256
-e "s/%proxy_extensions%/${PROXY_EXT//,/|}/g" \
252257
-e "s|%user%|$user|g" \
253258
-e "s|%group%|$user|g" \
@@ -739,6 +744,10 @@ add_webmail_config() {
739744

740745
fi
741746

747+
# Note: Removing or renaming template variables will lead to broken custom templates.
748+
# -If possible custom templates should be automatically upgraded to use the new format
749+
# -Alternatively a depreciation period with proper notifications should be considered
750+
742751
cat $MAILTPL/$1/$2 | \
743752
sed -e "s|%ip%|$local_ip|g" \
744753
-e "s|%domain%|$WEBMAIL_ALIAS.$domain|g" \

0 commit comments

Comments
 (0)