makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Derky 2019-01-01 23:12:33 +01:00
commit 07efa7c19b
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -1,6 +1,5 @@
language: php language: php
sudo: required sudo: required
dist: precise
matrix: matrix:
include: include:

2
travis/setup-mariadb.sh
View file

@ -12,7 +12,7 @@ set -e
set -x set -x
# MariaDB Series # MariaDB Series
VERSION='5.5' VERSION='10.0'
# Operating system codename, e.g. "precise" # Operating system codename, e.g. "precise"
OS_CODENAME=$(lsb_release --codename --short) OS_CODENAME=$(lsb_release --codename --short)

12
travis/setup-php-extensions.sh
View file

@ -46,13 +46,23 @@ php_ini_file=$(find_php_ini)
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ] if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ]
then then
echo 'Enabling APC PHP extension' 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" echo 'apc.enable_cli=1' >> "$php_ini_file"
else else
echo 'Disabling Opcache' echo 'Disabling Opcache'
echo 'opcache.enable=0' >> "$php_ini_file" echo 'opcache.enable=0' >> "$php_ini_file"
fi fi
# APCu
if [ `php -r "echo (int) (version_compare(PHP_VERSION, '7.0.0-dev', '>=') && version_compare(PHP_VERSION, '7.3.0-dev', '<'));"` == "1" ]
then
echo 'Enabling APCu PHP extension'
printf "\n" | pecl install apcu
echo 'apc.enabled=1' >> "$php_ini_file"
echo 'apc.enable_cli=1' >> "$php_ini_file"
fi
# redis # redis
# Disabled redis for now as it causes travis to fail # Disabled redis for now as it causes travis to fail
# git clone git://github.com/nicolasff/phpredis.git redis # git clone git://github.com/nicolasff/phpredis.git redis

6
travis/setup-webserver.sh
View file

@ -19,7 +19,8 @@ sudo service nginx stop
DIR=$(dirname "$0") DIR=$(dirname "$0")
USER=$(whoami) USER=$(whoami)
PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") 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 APP_SOCK=$(realpath "$DIR")/php-app.sock
# php-fpm # php-fpm
@ -50,6 +51,7 @@ cat $DIR/../phpBB/docs/nginx.sample.conf \
| sed -e '/If running php as fastcgi/,$d' \ | 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/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/' \ | 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 service nginx start sudo service nginx start