xmpp-wizard.sh

@@ -43,7 +43,7 @@ while read -p "$adminusername@$domain is this correct? (y/n): " confirm; do
 done
 
 read -p "Enter the password for the ejabberd SQL user: " sqlpassword
-while read -p "$sqlpassword is this correct? (y/n): " confirm; do
+while read -p "$adminpassword is this correct? (y/n): " confirm; do
     if [ "$confirm" == "y" ]; then
         break
     else
@@ -54,7 +54,7 @@ done
 
 mariadb -e "CREATE DATABASE $sqldb; CREATE USER $sqlusername@localhost IDENTIFIED BY '$sqlpassword'; GRANT ALL ON ejabberd.* TO $sqlusername@localhost"
 
-echo """
+echo "
 --
 -- ejabberd, Copyright (C) 2002-2023   ProcessOne
 --
@@ -520,12 +520,10 @@ CREATE TABLE mqtt_pub (
     user_properties blob NOT NULL,
     expiry int unsigned NOT NULL,
     UNIQUE KEY i_mqtt_topic (topic(191))
-) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;""" | mariadb -D $sqldb
+) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" | mariadb -D $sqldb
 
-if [ ! -f /etc/ssl/dh2048.pem ]
-    echo "Generating dhfile..."
-    openssl dhparam -out /etc/ssl/dh2048.pem 2048
-fi
+echo "Generating dhfile..."
+openssl dhparam -out /etc/ssl/dh2048.pem 2048
 
 echo "HTTP uploads in XMPP are stored on the server itself. There are many
 different parameters you can configure with respect to HTTP uploads. A soft