Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install MariaDB 10.1 in default provisioning #1115

Merged
merged 2 commits into from
Mar 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ VVV is ideal for developing themes and plugins as well as for [contributing to W
VVV is built on a Ubuntu 14.04 LTS (Trusty) base VM and provisions the server with current versions of several software packages, including:

1. [nginx](http://nginx.org/) ([mainline](http://nginx.com/blog/nginx-1-6-1-7-released/) version)
1. [MariaDB](https://mariadb.org/) 5.5.x (drop-in replacement for MySQL)
1. [MariaDB](https://mariadb.org/) 10.1.x (drop-in replacement for MySQL)
1. [php-fpm](http://php-fpm.org/) 7.0.x
1. [WP-CLI](http://wp-cli.org/) (master branch)
1. [memcached](http://memcached.org/)
Expand Down
5 changes: 5 additions & 0 deletions config/apt-source-append.list
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ deb-src http://nginx.org/packages/mainline/ubuntu/ trusty nginx
deb http://ppa.launchpad.net/ondrej/php/ubuntu trusty main
deb-src http://ppa.launchpad.net/ondrej/php/ubuntu trusty main

# MariaDB 10.1 repository list as of 2017-03-04 21:42 UTC
# http://downloads.mariadb.org/mariadb/repositories/
deb [arch=amd64,i386] http://mirrors.accretive-networks.net/mariadb/repo/10.1/ubuntu trusty main
deb-src http://mirrors.accretive-networks.net/mariadb/repo/10.1/ubuntu trusty main

# Provides Node.js
deb https://deb.nodesource.com/node_6.x trusty main
deb-src https://deb.nodesource.com/node_6.x trusty main
9 changes: 7 additions & 2 deletions provision/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ package_install() {
# Use debconf-set-selections to specify the default password for the root MariaDB
# account. This runs on every provision, even if MariaDB has been installed. If
# MariaDB is already installed, it will not affect anything.
echo mariadb-server-5.5 mysql-server/root_password password "root" | debconf-set-selections
echo mariadb-server-5.5 mysql-server/root_password_again password "root" | debconf-set-selections
echo mariadb-server-10.1 mysql-server/root_password password "root" | debconf-set-selections
echo mariadb-server-10.1 mysql-server/root_password_again password "root" | debconf-set-selections

# Postfix
#
Expand Down Expand Up @@ -264,9 +264,14 @@ package_install() {
wget --quiet "http://nginx.org/keys/nginx_signing.key" -O- | apt-key add -

# Apply the PHP signing key
echo "Applying the PHP signing key..."
apt-key adv --quiet --keyserver "hkp://keyserver.ubuntu.com:80" --recv-key E5267A6C 2>&1 | grep "gpg:"
apt-key export E5267A6C | apt-key add -

# Apply the MariaDB signing key
echo "Applying the MariaDB signing key..."
apt-key adv --quiet --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db

# Update all of the package references before installing anything
echo "Running apt-get update..."
apt-get -y update
Expand Down