Merge branch 'patch-1' of git://github.com/thelittlefireman/nginx-php-fpm into thelittlefireman-patch-1
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
# Disable Strict Host checking for non interactive git clones
|
||||
|
||||
mkdir -p -m 0700 /root/.ssh
|
||||
# Prevent config files from being filled to infinity by force of stop and restart the container
|
||||
echo "" > /root/.ssh/config
|
||||
echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config
|
||||
|
||||
if [[ "$GIT_USE_SSH" == "1" ]] ; then
|
||||
@@ -74,6 +76,13 @@ if [ -f /var/www/html/conf/nginx/nginx-site-ssl.conf ]; then
|
||||
cp /var/www/html/conf/nginx/nginx-site-ssl.conf /etc/nginx/sites-available/default-ssl.conf
|
||||
fi
|
||||
|
||||
|
||||
# Prevent config files from being filled to infinity by force of stop and restart the container
|
||||
lastlinephpconf="$(grep "." /usr/local/etc/php-fpm.conf | tail -1)"
|
||||
if [[ $lastlinephpconf == *"php_flag[display_errors]"* ]]; then
|
||||
sed -i '$ d' /usr/local/etc/php-fpm.conf
|
||||
fi
|
||||
|
||||
# Display PHP error's or not
|
||||
if [[ "$ERRORS" != "1" ]] ; then
|
||||
echo php_flag[display_errors] = off >> /usr/local/etc/php-fpm.conf
|
||||
|
||||
Reference in New Issue
Block a user