makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.
This commit is contained in:
Nils Adermann 2013-10-26 10:53:49 -05:00
commit 5c5ff6cb7c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
travis/setup-mariadb.sh
View file

@ -4,6 +4,7 @@
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
# #
set -e set -e
set -x
# MariaDB Series # MariaDB Series
VERSION='5.5' VERSION='5.5'
@ -12,18 +13,18 @@ VERSION='5.5'
OS_CODENAME=$(lsb_release --codename --short) OS_CODENAME=$(lsb_release --codename --short)
# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
sudo apt-get purge -qq mysql-common sudo apt-get purge -y mysql-common
if ! which add-apt-repository > /dev/null if ! which add-apt-repository > /dev/null
then then
sudo apt-get update -qq sudo apt-get update
sudo apt-get install -qq python-software-properties sudo apt-get install -y python-software-properties
fi fi
MIRROR_DOMAIN='ftp.osuosl.org' MIRROR_DOMAIN='ftp.osuosl.org'
sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db 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 add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main"
sudo apt-get update -qq sudo apt-get update
# Pin repository in order to avoid conflicts with MySQL from distribution # Pin repository in order to avoid conflicts with MySQL from distribution
# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files # repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files
@ -36,7 +37,7 @@ Pin-Priority: 1000
sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" 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 debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd"
sudo apt-get install -qq mariadb-server sudo apt-get install -y mariadb-server
# Set root password to empty string. # Set root password to empty string.
echo " echo "

5
travis/setup-webserver.sh
View file

@ -4,9 +4,10 @@
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
# #
set -e set -e
set -x
sudo apt-get update -qq sudo apt-get update
sudo apt-get install -qq nginx realpath sudo apt-get install -y nginx realpath
sudo service nginx stop sudo service nginx stop