Commit 08fcaa99 authored by w4t's avatar w4t

wtserver 0.70

parent d9d332b4
...@@ -32,12 +32,10 @@ InstallISPConfig() { ...@@ -32,12 +32,10 @@ InstallISPConfig() {
else else
SQL_COMMAND="mysql" SQL_COMMAND="mysql"
fi fi
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER 'ispconfig'@'localhost' IDENTIFIED BY $CFG_MYSQL_ISPCONFIG_PWD;" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER 'ispconfig'@'localhost' IDENTIFIED BY '$CFG_MYSQL_ISPCONFIG_PWD';" > /dev/null 2>&1
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON *.* TO 'ispconfig'@'localhost' WITH GRANT OPTION;" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON *.* TO 'ispconfig'@'localhost' WITH GRANT OPTION;" > /dev/null 2>&1
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "FLUSH PRIVILEGES;" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "FLUSH PRIVILEGES;" > /dev/null 2>&1
CFG_MYSQL_ROOT_PWD=$(tr </dev/urandom -dc 'A-Z-a-z-0-9' | head -c${1:-29})
if [ "$CFG_ISPC" == "standard" ]; then if [ "$CFG_ISPC" == "standard" ]; then
echo -n -e "$IDENTATION_LVL_1 Creating autoinstall configuration file... " echo -n -e "$IDENTATION_LVL_1 Creating autoinstall configuration file... "
cat <<EOF > $AUTO_INSTALL_INI_LOCATION/autoinstall.ini cat <<EOF > $AUTO_INSTALL_INI_LOCATION/autoinstall.ini
......
...@@ -149,8 +149,8 @@ default-authentication-plugin=mysql_native_password ...@@ -149,8 +149,8 @@ default-authentication-plugin=mysql_native_password
echo -n -e "$IDENTATION_LVL_0 ${BWhite}Installing MariaDB...${NC}\n" echo -n -e "$IDENTATION_LVL_0 ${BWhite}Installing MariaDB...${NC}\n"
echo -n -e "$IDENTATION_LVL_1 Setting debconf selections... " echo -n -e "$IDENTATION_LVL_1 Setting debconf selections... "
echo "maria-server-11.8.1 mysql-server/root_password password $CFG_MYSQL_ROOT_PWD" | debconf-set-selections echo "maria-server-11.8.1 mysql-server/root_password password '$CFG_MYSQL_ROOT_PWD'" | debconf-set-selections
echo "maria-server-11.8.1 mysql-server/root_password_again password $CFG_MYSQL_ROOT_PWD" | debconf-set-selections echo "maria-server-11.8.1 mysql-server/root_password_again password '$CFG_MYSQL_ROOT_PWD'" | debconf-set-selections
echo -e "[${green}DONE${NC}]" echo -e "[${green}DONE${NC}]"
echo -n -e "$IDENTATION_LVL_1 Installing MariaDB Server & Client... " echo -n -e "$IDENTATION_LVL_1 Installing MariaDB Server & Client... "
......
...@@ -198,13 +198,13 @@ EOF ...@@ -198,13 +198,13 @@ EOF
SQL_COMMAND="mysql" SQL_COMMAND="mysql"
fi fi
if [ $CFG_CLOUDDBHOST == "localhost" ]; then if [ $CFG_CLOUDDBHOST == "localhost" ]; then
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE $CFG_CLOUDDBNAME" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE $CFG_CLOUDDBNAME"
##$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 "CREATE DATABASE $CFG_CLOUDDBNAME CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" > /dev/null 2>&1
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "USE $CFG_CLOUDDBNAME" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "USE $CFG_CLOUDDBNAME"
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD';" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD';"
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost';" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost';"
#$SQL_COMMAND -uroot -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 -uroot -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 -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "flush privileges;" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "flush privileges;"
#echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql #echo "CREATE DATABASE $CFG_CLOUDDBNAME" > $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
#echo "USE $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 "GRANT ALL PRIVILEGES ON $CFG_CLOUDDBNAME.* TO '$CFG_CLOUDDBUSER'@'localhost' IDENTIFIED BY '$CFG_CLOUDDBPWD'" >> $PROGRAMS_INSTALL_SQLS/nextcloud_localhost.sql
......
...@@ -201,15 +201,15 @@ EOF ...@@ -201,15 +201,15 @@ EOF
fi fi
# Configure phpMyAdmin database # Configure phpMyAdmin database
#$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE phpmyadmin;" $SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE phpmyadmin;"
#$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER 'pma'@'localhost' IDENTIFIED BY '$CFG_MYSQL_ROOT_PWD';" $SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE USER 'pma'@'localhost' IDENTIFIED BY '$CFG_MYSQL_ROOT_PWD';"
#$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON phpmyadmin.* TO 'pma'@'localhost' IDENTIFIED BY '$CFG_MYSQL_ROOT_PWD' WITH GRANT OPTION;" $SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON phpmyadmin.* TO 'pma'@'localhost' IDENTIFIED BY '$CFG_MYSQL_ROOT_PWD' WITH GRANT OPTION;"
#$SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "FLUSH PRIVILEGES;" $SQL_COMMAND -u root -p"$CFG_MYSQL_ROOT_PWD" -e "FLUSH PRIVILEGES;"
echo "CREATE DATABASE phpmyadmin;" > $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql #echo "CREATE DATABASE phpmyadmin;" > $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql
echo "CREATE USER 'pma'@'localhost' IDENTIFIED BY $CFG_MYSQL_ROOT_PWD;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql #echo "CREATE USER 'pma'@'localhost' IDENTIFIED BY $CFG_MYSQL_ROOT_PWD;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql
echo "GRANT ALL PRIVILEGES ON phpmyadmin.* TO 'pma'@'localhost' IDENTIFIED BY $CFG_MYSQL_ROOT_PWD WITH GRANT OPTION;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql #echo "GRANT ALL PRIVILEGES ON phpmyadmin.* TO 'pma'@'localhost' IDENTIFIED BY $CFG_MYSQL_ROOT_PWD WITH GRANT OPTION;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql
echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql #echo "FLUSH PRIVILEGES;" >> $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" < $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1 #$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" < $PROGRAMS_INSTALL_SQLS/phpmyadmin.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" phpmyadmin < /usr/share/phpmyadmin/sql/create_tables.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" phpmyadmin < /usr/share/phpmyadmin/sql/create_tables.sql >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
echo -e "[${green}DONE${NC}]" echo -e "[${green}DONE${NC}]"
......
...@@ -174,10 +174,10 @@ InstallRoundcubeLatest() { ...@@ -174,10 +174,10 @@ InstallRoundcubeLatest() {
else else
SQL_COMMAND="mysql" SQL_COMMAND="mysql"
fi fi
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE ${CFG_ROUNDCUBE_DB}" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "CREATE DATABASE ${CFG_ROUNDCUBE_DB}"
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON ${CFG_ROUNDCUBE_DB}.* TO ${CFG_ROUNDCUBE_USR}@localhost IDENTIFIED BY $CFG_ROUNDCUBE_PWD" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "GRANT ALL PRIVILEGES ON ${CFG_ROUNDCUBE_DB}.* TO '${CFG_ROUNDCUBE_USR}'@'localhost' IDENTIFIED BY '${CFG_ROUNDCUBE_PWD}'"
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "flush privileges;" > /dev/null 2>&1 $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" -e "flush privileges;"
$SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" "${CFG_ROUNDCUBE_DB}" < /usr/share/roundcube/SQL/mysql.initial.sql $SQL_COMMAND -uroot -p"$CFG_MYSQL_ROOT_PWD" ${CFG_ROUNDCUBE_DB} < /usr/share/roundcube/SQL/mysql.initial.sql
cp -pf /usr/share/roundcube/config/config.inc.php.sample /usr/share/roundcube/config/config.inc.php cp -pf /usr/share/roundcube/config/config.inc.php.sample /usr/share/roundcube/config/config.inc.php
CFG_ROUNDCUBE_PRODUCTNAME=$(echo "$CFG_HOSTNAME_DOMAIN" | cut -d. -f1 | sed 's/\b\(.\)/\u\1/g') CFG_ROUNDCUBE_PRODUCTNAME=$(echo "$CFG_HOSTNAME_DOMAIN" | cut -d. -f1 | sed 's/\b\(.\)/\u\1/g')
sed -i "s/\$config\['product_name'\] = 'Roundcube Webmail';/\$config\['product_name'\] = '$CFG_ROUNDCUBE_PRODUCTNAME Webmail';/" /usr/share/roundcube/config/config.inc.php sed -i "s/\$config\['product_name'\] = 'Roundcube Webmail';/\$config\['product_name'\] = '$CFG_ROUNDCUBE_PRODUCTNAME Webmail';/" /usr/share/roundcube/config/config.inc.php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment