From 444e5e6498c90c6c6e64f03d520b12eaf27b73db Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 23:19:01 +0100
Subject: [ticket/15924] Switch to trusty build environment

PHPBB3-15924
---
 travis/setup-mariadb.sh   | 54 -----------------------------------------------
 travis/setup-phpbb.sh     |  5 -----
 travis/setup-webserver.sh |  7 ++++--
 3 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100755 travis/setup-mariadb.sh

(limited to 'travis')

diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh
deleted file mode 100755
index 9bc487915d..0000000000
--- a/travis/setup-mariadb.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the phpBB Forum Software package.
-#
-# @copyright (c) phpBB Limited <https://www.phpbb.com>
-# @license GNU General Public License, version 2 (GPL-2.0)
-#
-# For full copyright and license information, please see
-# the docs/CREDITS.txt file.
-#
-set -e
-set -x
-
-# MariaDB Series
-VERSION='5.5'
-
-# Operating system codename, e.g. "precise"
-OS_CODENAME=$(lsb_release --codename --short)
-
-# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
-sudo apt-get purge -y mysql-common
-
-if ! which add-apt-repository > /dev/null
-then
-	sudo apt-get update
-	sudo apt-get install -y 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://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main"
-sudo apt-get update
-
-# 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 -y mariadb-server
-
-# Set root password to empty string.
-echo "
-USE mysql;
-UPDATE user SET Password = PASSWORD('') where User = 'root';
-FLUSH PRIVILEGES;
-" | mysql -u root -prootpasswd
-
-mysql --version
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index be9eb703d5..98e9afa485 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -21,11 +21,6 @@ then
 	travis/setup-unbuffer.sh
 fi
 
-if [ "$DB" == "mariadb" ]
-then
-	travis/setup-mariadb.sh
-fi
-
 if [ "$NOTESTS" != '1' ]
 then
 	travis/setup-php-extensions.sh
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 7fb67e0454..f4e78124d8 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -19,7 +19,8 @@ sudo service nginx stop
 DIR=$(dirname "$0")
 USER=$(whoami)
 PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
-NGINX_CONF="/etc/nginx/sites-enabled/default"
+NGINX_SITE_CONF="/etc/nginx/sites-enabled/default"
+NGINX_CONF="/etc/nginx/nginx.conf"
 APP_SOCK=$(realpath "$DIR")/php-app.sock
 
 # php-fpm
@@ -50,6 +51,8 @@ cat $DIR/../phpBB/docs/nginx.sample.conf \
 | sed -e '/If running php as fastcgi/,$d' \
 | sed -e "s/fastcgi_pass php;/fastcgi_pass unix:$(echo $APP_SOCK | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g');/g" \
 | sed -e 's/#listen 80/listen 80/' \
-| sudo tee $NGINX_CONF
+| sudo tee $NGINX_SITE_CONF
+sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF
 
+sudo nginx -t
 sudo service nginx start
-- 
cgit v1.2.1