Fixed empty variable issue (again)

This commit is contained in:
jacob.eva 2023-11-08 20:37:32 +00:00
parent 853b80b653
commit 3d0514e533
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E

View File

@ -743,11 +743,6 @@ shaper_rules:
normal: all normal: all
s2s_shaper: fast" s2s_shaper: fast"
upload2="
soft_upload_quota:
$softquota: all # MB
hard_upload_quota:
$hardquota: all # MB"
modules1=" modules1="
modules: modules:
@ -878,26 +873,6 @@ the user has on the server is less than the soft quota.
Would you like to enable HTTP uploads?" httpuploads Would you like to enable HTTP uploads?" httpuploads
if [ "$httpuploads" == "y" ]; then if [ "$httpuploads" == "y" ]; then
if [ "$stunturn" == "y" ]; then
config+=${upload1}
config+=${stun1}
config+=${midsection}
config+=${upload2}
config+=${modules}
config+=${upload3}
config+=${modules2}
config+=${stun2}
config+=${footer}
else
config+=${upload1}
config+=${midsection}
config+=${upload2}
config+=${modules}
config+=${upload3}
config+=${modules2}
config+=${footer}
fi
read -p "What soft quota would you like to set per user? (MB): " softquota read -p "What soft quota would you like to set per user? (MB): " softquota
while read -p "$softquota MB is this correct? (y/n):" confirm; do while read -p "$softquota MB is this correct? (y/n):" confirm; do
if [ "$confirm" == "y" ]; then if [ "$confirm" == "y" ]; then
@ -917,6 +892,31 @@ if [ "$httpuploads" == "y" ]; then
continue continue
fi fi
done done
upload2="
soft_upload_quota:
$softquota: all # MB
hard_upload_quota:
$hardquota: all # MB"
if [ "$stunturn" == "y" ]; then
config+=${upload1}
config+=${stun1}
config+=${midsection}
config+=${upload2}
config+=${modules}
config+=${upload3}
config+=${modules2}
config+=${stun2}
config+=${footer}
else
config+=${upload1}
config+=${midsection}
config+=${upload2}
config+=${modules}
config+=${upload3}
config+=${modules2}
config+=${footer}
fi
else else
if [ "$stunturn" == "y" ]; then if [ "$stunturn" == "y" ]; then
config+=${stun1} config+=${stun1}