diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-11 10:05:57 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-11 10:05:57 -0600 |
| commit | fb4b19eeadc3bee1997edc46f75fe9aeca5502fb (patch) | |
| tree | ab48a89415000304bad21a993c7cec573cf5e1b9 /salt/openbook/database | |
| parent | db4131ba3bafa8185d32d207c3ab5fd6496729c8 (diff) | |
upgrade to mariadb 10.2 and pull the unstable branch for CI
Diffstat (limited to 'salt/openbook/database')
| -rw-r--r-- | salt/openbook/database/files/debconfrc | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/installdeps.sh | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/start_galera_node.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/salt/openbook/database/files/debconfrc b/salt/openbook/database/files/debconfrc index 689cd64..b848278 100644 --- a/salt/openbook/database/files/debconfrc +++ b/salt/openbook/database/files/debconfrc @@ -1,2 +1,2 @@ -mariadb-server-10.1 mysql-server/root_password password {% raw %}{{ openbook_database_password }}{% endraw %} -mariadb-server-10.1 mysql-server/root_password_again password {% raw %}{{ openbook_database_password }}{% endraw %} +mariadb-server-10.2 mysql-server/root_password password {% raw %}{{ openbook_database_password }}{% endraw %} +mariadb-server-10.2 mysql-server/root_password_again password {% raw %}{{ openbook_database_password }}{% endraw %} diff --git a/salt/openbook/database/files/installdeps.sh b/salt/openbook/database/files/installdeps.sh index 2575726..e71a4ae 100644 --- a/salt/openbook/database/files/installdeps.sh +++ b/salt/openbook/database/files/installdeps.sh @@ -5,10 +5,10 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install software-properties-common apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 -add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main' +add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main' apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.1 xinetd +apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.2 xinetd service mysql stop service xinetd stop diff --git a/salt/openbook/database/files/start_galera_node.sh b/salt/openbook/database/files/start_galera_node.sh index 3746a0d..8360683 100644 --- a/salt/openbook/database/files/start_galera_node.sh +++ b/salt/openbook/database/files/start_galera_node.sh @@ -5,7 +5,7 @@ if [ ! -d "{{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}/mysql" ]; t export DEBIAN_FRONTEND=noninteractive . /etc/profile debconf-set-selections /etc/mysql/conf.d/debconfrc - dpkg-reconfigure mariadb-server-10.1 + dpkg-reconfigure mariadb-server-10.2 fi /etc/mysql/bin/fix_permissions.sh & |