From 19dc53d55fb5333a83acbe0b1f0578827b5c4776 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 25 May 2016 22:28:40 +0200 Subject: [PATCH] Upgrade phpBB3 importer template to work with Ubuntu 16.04 --- templates/import/phpbb3.template.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/templates/import/phpbb3.template.yml b/templates/import/phpbb3.template.yml index 1cd7454..fafde35 100644 --- a/templates/import/phpbb3.template.yml +++ b/templates/import/phpbb3.template.yml @@ -18,14 +18,6 @@ hooks: - rm 01-nginx - rm 02-unicorn - - file: - path: /etc/apt/sources.list.d/mariadb.list - contents: | - # MariaDB 10.1 repository list - # http://mariadb.org/mariadb/repositories/ - deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu trusty main - deb-src http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu trusty main - - file: path: /etc/apt/preferences.d/mariadb contents: | @@ -50,7 +42,8 @@ hooks: - exec: cmd: - mkdir -p /shared/import/mysql/data - - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + - add-apt-repository 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main' - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y nano libmariadbclient-dev mariadb-server - sed -Ei 's/^log/#&/' /etc/mysql/my.cnf -- 2.25.1