git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8375b2f
)
wip travis
author
gggeek
<giunta.gaetano@gmail.com>
Sun, 13 Dec 2020 18:34:26 +0000
(18:34 +0000)
committer
gggeek
<giunta.gaetano@gmail.com>
Sun, 13 Dec 2020 18:34:26 +0000
(18:34 +0000)
tests/ci/setup/setup_php_travis.sh
patch
|
blob
|
history
diff --git
a/tests/ci/setup/setup_php_travis.sh
b/tests/ci/setup/setup_php_travis.sh
index
2f5e9b0
..
650e91b
100755
(executable)
--- a/
tests/ci/setup/setup_php_travis.sh
+++ b/
tests/ci/setup/setup_php_travis.sh
@@
-39,6
+39,7
@@
if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
if [ "$TRAVIS_PHP_VERSION" = "7.3" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
fi
if [ "$TRAVIS_PHP_VERSION" = "7.3" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
fi
+ # it seems that www.conf exists for php 7.4 and 8.0...
fi
#cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf
fi
#cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf
@@
-46,6
+47,7
@@
fi
# Use a unix socket for communication between apache and php-fpm - same as stock Ubuntu does
sed -i -e "s,listen = 127.0.0.1:9000,listen = /run/php/php-fpm.sock,g" ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
# Use a unix socket for communication between apache and php-fpm - same as stock Ubuntu does
sed -i -e "s,listen = 127.0.0.1:9000,listen = /run/php/php-fpm.sock,g" ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
+mkdir /run/php
# @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
~/.phpenv/versions/${PHPVER}/sbin/php-fpm
# @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
~/.phpenv/versions/${PHPVER}/sbin/php-fpm