aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-12-31 23:15:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-12-31 23:26:53 +0100
commitbdf9af0abbadcce51a47ba586a800eafe2093814 (patch)
treeae4812c6c916b3a8859d8d6670da6a4dc6f7e01d /travis
parent444e5e6498c90c6c6e64f03d520b12eaf27b73db (diff)
downloadforums-bdf9af0abbadcce51a47ba586a800eafe2093814.tar
forums-bdf9af0abbadcce51a47ba586a800eafe2093814.tar.gz
forums-bdf9af0abbadcce51a47ba586a800eafe2093814.tar.bz2
forums-bdf9af0abbadcce51a47ba586a800eafe2093814.tar.xz
forums-bdf9af0abbadcce51a47ba586a800eafe2093814.zip
[ticket/15924] Install apc via pecl and remove nginx config check
PHPBB3-15924
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-php-extensions.sh2
-rwxr-xr-xtravis/setup-webserver.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
index d9544858b7..347d7b5773 100755
--- a/travis/setup-php-extensions.sh
+++ b/travis/setup-php-extensions.sh
@@ -46,7 +46,7 @@ php_ini_file=$(find_php_ini)
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ]
then
echo 'Enabling APC PHP extension'
- register_php_extension 'apc' "$php_ini_file"
+ printf "\n" | pecl install apc
echo 'apc.enable_cli=1' >> "$php_ini_file"
else
echo 'Disabling Opcache'
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index f4e78124d8..fd87d97449 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -54,5 +54,4 @@ cat $DIR/../phpBB/docs/nginx.sample.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