wtserver 0.63

distros/debian12/install_owncloud.sh

@@ -198,26 +198,26 @@ EOF
 		SQL_COMMAND="mysql"
 	    fi
 	    if [ $CFG_CLOUDDBHOST == "localhost" ]; then
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
 		##$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "CREATE DATABASE $CFG_CLOUDDBNAME CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
-		echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
-		echo "USE $CFG_CLOUDDBNAME" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
-		echo "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
-		echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
-		$SQL_COMMAND -u root -p$CFG_MYSQL_ROOT_PWD < $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
+		#echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
+		#echo "USE $CFG_CLOUDDBNAME" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
+		#echo "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
+		#echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
+		#$SQL_COMMAND -u root -p$CFG_MYSQL_ROOT_PWD < $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    else
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'%' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
-		#$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
-		echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
-		echo "USE $CFG_CLOUDDBNAME" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
-		echo "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'%' IDENTIFIED BY '$CFG_CLOUDDBPWD'" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
-		echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
-		$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -h"$CFG_CLOUDDBHOST" < $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -h $CFG_CLOUDDBHOST -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'%' IDENTIFIED BY '$CFG_CLOUDDBPWD'" > /dev/null 2>&1
+		$SQL_COMMAND -u $dbruser -p$CFG_MYSQL_ROOT_PWD -e "flush privileges;" > /dev/null 2>&1
+		#echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
+		#echo "USE $CFG_CLOUDDBNAME" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
+		#echo "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'%' IDENTIFIED BY '$CFG_CLOUDDBPWD'" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
+		#echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql
+		#$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -h"$CFG_CLOUDDBHOST" < $PROGRAMS_INSTALL_SQLS/nextcloud_externalhost.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    fi
 
 	    # Enable UTF8mb4 (4-byte support)