xmpp-wizard.sh

@@ -743,6 +743,11 @@ shaper_rules:
     normal: all
   s2s_shaper: fast"
 
+upload2="
+  soft_upload_quota:
+    $softquota: all # MB
+  hard_upload_quota:
+    $hardquota: all # MB"
 
 modules1="
 modules:
@@ -863,41 +868,16 @@ read -p "Some XMPP clients may support P2P voice / video calls, but will require
 assistance from the server in order to be able to connect to each other through
 networks with NAT (almost every network). 
 Would you like to enable the STUN/TURN server within ejabberd to relay traffic
-for these clients so their calls will work correctly? (y/n): " stunturn
+for these clients so their calls will work correctly?" stunturn
 
 read -p "HTTP uploads (XEP-0363) in XMPP are stored on the server itself. There
 are many different parameters you can configure with respect to HTTP uploads. A
 soft quota can be set per user, along with a hard quota. After the hard quota
 is exceeded, files are deleted from the oldest until the total size of files
 the user has on the server is less than the soft quota.
-Would you like to enable HTTP uploads? (y/n): " httpuploads
+Would you like to enable HTTP uploads?" httpuploads
 
 if [ "$httpuploads" == "y" ]; then
-    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
-        if [ "$confirm" == "y" ]; then
-            break
-        else
-            read -p "What soft quota would you like to set per user? (MB): " softquota
-            continue
-        fi
-    done
-
-    read -p "What hard quota would you like to set per user? (MB): " hardquota
-    while read -p "$hardquota MB is this correct? (y/n): " confirm; do
-        if [ "$confirm" == "y" ]; then
-            break
-        else
-            read -p "What hard quota would you like to set per user? (MB): " hardquota
-            continue
-        fi
-    done
-    upload2="
-      soft_upload_quota:
-        $softquota: all # MB
-      hard_upload_quota:
-        $hardquota: all # MB"
-
     if [ "$stunturn" == "y" ]; then
         config+=${upload1}
         config+=${stun1}
@@ -917,6 +897,26 @@ if [ "$httpuploads" == "y" ]; then
         config+=${modules2}
         config+=${footer}
     fi
+
+    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
+        if [ "$confirm" == "y" ]; then
+            break
+        else
+            read -p "What soft quota would you like to set per user? (MB): " softquota
+            continue
+        fi
+    done
+
+    read -p "What hard quota would you like to set per user? (MB): " hardquota
+    while read -p "$hardquota MB is this correct? (y/n): " confirm; do
+        if [ "$confirm" == "y" ]; then
+            break
+        else
+            read -p "What hard quota would you like to set per user? (MB): " hardquota
+            continue
+        fi
+    done
 else
     if [ "$stunturn" == "y" ]; then
         config+=${stun1}