Skip to content

Commit

Permalink
Use MariaDB 10.2 by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@omega8cc
omega8cc committed Jun 11, 2019
1 parent 318acf0 commit 1938cfa
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 39 deletions.
2 changes: 1 addition & 1 deletion aegir/tools/bin/barracuda
View file
Expand Up @@ -721,7 +721,7 @@ up_action() {
wait
sed -i "s/^_PERMISSIONS_FIX=.*/_PERMISSIONS_FIX=YES/g" ${barCnf}
wait
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.1/g" ${barCnf}
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.2/g" ${barCnf}
wait
if [ -e "/root/.mstr.clstr.cnf" ] \
|| [ -e "/root/.wbhd.clstr.cnf" ] \
Expand Down
2 changes: 1 addition & 1 deletion docs/cnf/barracuda.cnf
View file
Expand Up @@ -36,7 +36,7 @@ _CPU_MAX_RATIO=6 #-------------- Max load per CPU core before disabling Nginx
_CPU_SPIDER_RATIO=3 #----------- Max load per CPU core before blocking spiders
###
_DB_BINARY_LOG=NO #------------- Allows to enable binary logging when YES
_DB_SERIES=10.1 #--------------- Supported production values: 10.1 or 5.7
_DB_SERIES=10.2 #--------------- Supported values: 10.1, 10.2, 10.3 or 5.7
_DB_SERVER=MariaDB #------------ Allows to install MariaDB or Percona server
_USE_MYSQLTUNER=YES #----------- Use MySQLTuner to configure SQL limits when YES
###
Expand Down
8 changes: 4 additions & 4 deletions lib/functions/helper.sh.inc
View file
Expand Up @@ -532,8 +532,8 @@ os_detection() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
elif [ "${_THIS_RV}" = "precise" ]; then
_OSV="precise"
Expand Down Expand Up @@ -568,8 +568,8 @@ os_detection() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
_SPINNER=NO
_SKIP_LEGACY_PHP=YES
Expand Down
14 changes: 7 additions & 7 deletions lib/functions/php.sh.inc
View file
Expand Up @@ -1073,10 +1073,10 @@ install_php_multi() {
_T_DBS_VRN="${_GALERA_10_VRN}"
else
if [ "${_DB_SERIES}" = "10.0" ]; then
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.1/g" ${barCnf}
_DB_SERIES=10.1
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.2/g" ${barCnf}
_DB_SERIES=10.2
fi
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.1/g" ${barCnf}
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.2/g" ${barCnf}
if [ "${_DB_SERIES}" = "10.3" ] \
|| [ "${_DB_SERIES}" = "10.2" ] \
|| [ "${_DB_SERIES}" = "10.1" ] \
Expand All @@ -1097,8 +1097,8 @@ install_php_multi() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
_T_DBS_VRN="${_DBS_VRN}"
else
Expand Down Expand Up @@ -1443,8 +1443,8 @@ check_php_rebuild() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
_T_DBS_VRN="${_DBS_VRN}"
else
Expand Down
12 changes: 6 additions & 6 deletions lib/functions/sql.sh.inc
View file
Expand Up @@ -435,8 +435,8 @@ install_db_sql() {
echo -e 'Package: *\nPin: release o=Percona Development Team\nPin-Priority: 1001' > /etc/apt/preferences.d/00percona.pref
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
fi
msg "INFO: Installing ${_DB_SERVER} ${_DBS_VRN} in ${_THIS_OS}/${_OSV}"
Expand All @@ -448,13 +448,13 @@ install_db_sql() {
|| [ "${_DB_SERIES}" = "5.5" ]; then
_DO_NOTHING=YES
else
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
msg "INFO: Forced ${_DB_SERVER} ${_DBS_VRN} in ${_THIS_OS}/${_OSV}"
fi
if [ -z "${_DB_SERIES}" ]; then
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
msg "INFO: Forced ${_DB_SERVER} ${_DBS_VRN} in ${_THIS_OS}/${_OSV}"
fi
fi
Expand Down
28 changes: 14 additions & 14 deletions lib/functions/system.sh.inc
View file
Expand Up @@ -773,11 +773,11 @@ barracuda_cnf() {
_DBS_VRN="${_GALERA_10_VRN}"
else
if [ "${_DB_SERIES}" = "10.0" ] && [ -e "${barCnf}" ]; then
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.1/g" ${barCnf}
_DB_SERIES=10.1
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.2/g" ${barCnf}
_DB_SERIES=10.2
fi
if [ -e "${barCnf}" ]; then
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.1/g" ${barCnf}
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.2/g" ${barCnf}
fi
if [ "${_DB_SERIES}" = "10.3" ]; then
_DB_SERVER=MariaDB
Expand All @@ -793,14 +793,14 @@ barracuda_cnf() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
fi
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
msg "INFO: Creating your ${barCnf} config file"
sleep 1
Expand Down Expand Up @@ -1646,10 +1646,10 @@ barracuda_cnf() {
_DBS_VRN="${_GALERA_10_VRN}"
else
if [ "${_DB_SERIES}" = "10.0" ]; then
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.1/g" ${barCnf}
_DB_SERIES=10.1
sed -i "s/^_DB_SERIES=.*/_DB_SERIES=10.2/g" ${barCnf}
_DB_SERIES=10.2
fi
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.1/g" ${barCnf}
sed -i "s/^_DB_SERIES=5.5/_DB_SERIES=10.2/g" ${barCnf}
if [ "${_DB_SERIES}" = "10.3" ]; then
_DB_SERVER=MariaDB
_DBS_VRN="${_MARIADB_10_3_VRN}"
Expand All @@ -1664,14 +1664,14 @@ barracuda_cnf() {
_DBS_VRN="${_PERCONA_5_7_VRN}"
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
fi
else
_DB_SERVER=MariaDB
_DB_SERIES=10.1
_DBS_VRN="${_MARIADB_10_1_VRN}"
_DB_SERIES=10.2
_DBS_VRN="${_MARIADB_10_2_VRN}"
fi
_CHECK_HOST=$(uname -n 2>&1)
if [[ "${_MY_EMAIL}" =~ "omega8.cc" ]]; then
Expand Down
10 changes: 4 additions & 6 deletions lib/settings/barracuda.sh.cnf
View file
Expand Up @@ -291,14 +291,12 @@ _DB_SERVER=MariaDB
### DB SERIES ###
###----------------------------------------###
###
### You should choose 5.7 or 10.1
### Supported values:
### 10.1 or 10.2 or 10.3 (MariaDB)
### 5.7 (Percona)
###
### MariaDB 10.2 and 10.3 will be supported
### once compatibility issues with PHP 7.1+
### are fixed:
### https://jira.mariadb.org/browse/MDEV-14555
###
_DB_SERIES=10.1
_DB_SERIES=10.2


###----------------------------------------###
Expand Down

0 comments on commit 1938cfa

Please sign in to comment.