diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-25 14:01:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-25 14:01:33 +0200 |
| commit | 66841a55d05ec0d0c0928b86bbf66f93bff8bede (patch) | |
| tree | d82e3c3a6ef30f8c70c74d527a1977b91ef91918 | |
| parent | 5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa (diff) | |
| parent | acc6e440d019787f3f0aaedd775576805e6fc76d (diff) | |
| download | forums-66841a55d05ec0d0c0928b86bbf66f93bff8bede.tar forums-66841a55d05ec0d0c0928b86bbf66f93bff8bede.tar.gz forums-66841a55d05ec0d0c0928b86bbf66f93bff8bede.tar.bz2 forums-66841a55d05ec0d0c0928b86bbf66f93bff8bede.tar.xz forums-66841a55d05ec0d0c0928b86bbf66f93bff8bede.zip | |
Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympus
* bantu/ticket/11920:
[ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
| -rwxr-xr-x | travis/setup-mariadb.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 02520b1c2c..d9a88edb24 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -20,10 +20,20 @@ then sudo apt-get install -qq python-software-properties fi +MIRROR_DOMAIN='ftp.osuosl.org' sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db -sudo add-apt-repository "deb http://ftp.osuosl.org/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" +sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update -qq +# Pin repository in order to avoid conflicts with MySQL from distribution +# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files +# section "Version Mismatch Between MariaDB and Ubuntu/Debian Repositories" +echo " +Package: * +Pin: origin $MIRROR_DOMAIN +Pin-Priority: 1000 +" | sudo tee /etc/apt/preferences.d/mariadb + sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" sudo apt-get install -qq mariadb-server |