diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-26 10:53:49 -0500 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-26 10:53:49 -0500 |
| commit | 5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8 (patch) | |
| tree | cb435935cafd13ec91f158c244a56f6f6ffe6fed /travis | |
| parent | f40f378483f84aaf4e3a636e15589a40e16e0b90 (diff) | |
| parent | 3eb4575f618cfafb0231e64ab2461089b364fd8d (diff) | |
| download | forums-5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8.tar forums-5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8.tar.gz forums-5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8.tar.bz2 forums-5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8.tar.xz forums-5c5ff6cb7c895a0c23d3687f509d1cc26ed4e5a8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11970] Make apt-get less quiet.
[ticket/11970] Add set -x to Travis setup scripts.
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-mariadb.sh | 11 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index d9a88edb24..aceb6af7ee 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -4,6 +4,7 @@ # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # set -e +set -x # MariaDB Series VERSION='5.5' @@ -12,18 +13,18 @@ VERSION='5.5' OS_CODENAME=$(lsb_release --codename --short) # 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 then - sudo apt-get update -qq - sudo apt-get install -qq python-software-properties + 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 -qq +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 @@ -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_again password rootpasswd" -sudo apt-get install -qq mariadb-server +sudo apt-get install -y mariadb-server # Set root password to empty string. echo " diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 95fc4ec1f8..f1bf69c575 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -4,9 +4,10 @@ # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # set -e +set -x -sudo apt-get update -qq -sudo apt-get install -qq nginx realpath +sudo apt-get update +sudo apt-get install -y nginx realpath sudo service nginx stop |