MariaDB 10.11

	modified:   README.md
	modified:   ols1clk.sh

README.md

@@ -23,7 +23,7 @@ When run with no options, ols1clk will install OpenLiteSpeed with the default se
 |      |`--adminport [PORTNUMBER]`|          To set the WebAdmin console port number instead of 7080.|
 | `-E` |`--email [EMAIL]`|                 To set the administrator email.|
 |      |`--lsphp [VERSION]`    |           To set the LSPHP version, such as 82. We currently support versions '71 72 73 74 80 81 82'.|
-|      |`--mariadbver [VERSION]`  |        To set MariaDB version, such as 10.9. We currently support versions '10.2 10.3 ...10.9'.|
+|      |`--mariadbver [VERSION]`  |        To set MariaDB version, such as 10.9. We currently support versions '10.2 10.3 ...10.1'.|
 | `-W` |`--wordpress`|                     To install WordPress. You will still need to complete the WordPress setup by browser|
 |      |  `--wordpressplus [SITEDOMAIN]`|  To install, set up, and configure WordPress, also LSCache will be enabled|
 |      |  `--wordpresspath [WP_PATH]`|     To specify a location for the new WordPress installation or use for an existing WordPress.|

ols1clk.sh

@@ -64,10 +64,10 @@ ROOTPASSWORD=
 USERPASSWORD=
 WPPASSWORD=
 LSPHPVERLIST=(71 72 73 74 80 81 82)
-MARIADBVERLIST=(10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9)
+MARIADBVERLIST=(10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11)
 OLD_SYS_MARIADBVERLIST=(10.2 10.3 10.4 10.5)
 LSPHPVER=81
-MARIADBVER=10.9
+MARIADBVER=10.11
 MYSQLVER=8.0
 PERCONAVER=80
 WEBADMIN_LSPHPVER=74
@@ -1794,10 +1794,13 @@ function befor_install_display
     echoY "WebAdmin password:        " "$ADMINPASSWORD"
     echoY "WebAdmin email:           " "$EMAIL"
     echoY "LSPHP version:            " "$LSPHPVER"
-    if [ ${WITH_MYSQL} = 0 ] && [ "${PURE_MYSQL}" = 0 ] && [ "${WITH_PERCONA}" = 0 ] && [ "${PURE_PERCONA}" = 0 ]; then 
+    if [ ${WITH_MYSQL} = 0 ] && [ "${PURE_MYSQL}" = 0 ] && [ "${WITH_PERCONA}" = 0 ] && [ "${PURE_PERCONA}" = 0 ] && [ "${PURE_DB}" = 0 ]; then 
         if [ ${INSTALLWORDPRESS} = 1 ]; then
             echoY "MariaDB version:          " "$MARIADBVER"
         fi
+    elif [ "${PURE_DB}" = 1 ]; then
+        echoY "MariaDB version:          " "$MARIADBVER"
+        echoY "MariaDB root Password:    " "$ROOTPASSWORD"    
     elif [ "${PURE_MYSQL}" = 1 ]; then 
         echoY "MySQL version:            " "$MYSQLVER"
         echoY "MySQL root Password:      " "$ROOTPASSWORD"