php option

This commit is contained in:
Bob Mottram 2018-03-31 18:14:01 +01:00
parent 8d75ab63da
commit 7d70a117fa
2 changed files with 14 additions and 4 deletions

View File

@ -314,7 +314,7 @@ function install_bludit {
echo ' # Location'; echo ' # Location';
echo ' location / {'; } >> "$bludit_nginx_site" echo ' location / {'; } >> "$bludit_nginx_site"
nginx_limits "$BLUDIT_DOMAIN_NAME" '15m' nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
{ echo " try_files \$uri \$uri/ /index.html;"; { echo " try_files \$uri \$uri/ /index.php?\$args;";
echo ' }'; echo ' }';
echo '}'; } >> "$bludit_nginx_site" echo '}'; } >> "$bludit_nginx_site"
else else
@ -345,7 +345,7 @@ function install_bludit {
echo ' # Location'; echo ' # Location';
echo ' location / {'; } >> "$bludit_nginx_site" echo ' location / {'; } >> "$bludit_nginx_site"
nginx_limits "$BLUDIT_DOMAIN_NAME" '15m' nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
{ echo " try_files \$uri \$uri/ index.html;"; { echo " try_files \$uri \$uri/ index.php?\$args;";
echo ' }'; echo ' }';
echo '}'; } >> "$bludit_nginx_site" echo '}'; } >> "$bludit_nginx_site"

View File

@ -686,6 +686,7 @@ if [ ! $app_onion_only ]; then
echo " echo ' include snippets/fastcgi-php.conf;';" echo " echo ' include snippets/fastcgi-php.conf;';"
echo " echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';" echo " echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
echo " echo ' fastcgi_read_timeout 30;';" echo " echo ' fastcgi_read_timeout 30;';"
echo " echo ' fastcgi_param HTTPS on;';"
echo " echo ' }';" echo " echo ' }';"
echo " echo '';" echo " echo '';"
else else
@ -695,7 +696,11 @@ if [ ! $app_onion_only ]; then
echo " echo ' location / {'; } >> \"\$${app_name}_nginx_site\"" echo " echo ' location / {'; } >> \"\$${app_name}_nginx_site\""
echo " nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'" echo " nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
if [ ! $app_daemon ]; then if [ ! $app_daemon ]; then
if [[ "$app_php" != 'yes' ]]; then
echo " { echo \" try_files \\\$uri \\\$uri/ /index.html;\";" echo " { echo \" try_files \\\$uri \\\$uri/ /index.html;\";"
else
echo " { echo \" try_files \\\$uri \\\$uri/ /index.php?\\\$args;\";"
fi
else else
echo " { echo \" proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";" echo " { echo \" proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
fi fi
@ -728,6 +733,7 @@ if [[ "$app_php" == 'yes' ]]; then
echo " echo ' include snippets/fastcgi-php.conf;';" echo " echo ' include snippets/fastcgi-php.conf;';"
echo " echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';" echo " echo ' fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
echo " echo ' fastcgi_read_timeout 30;';" echo " echo ' fastcgi_read_timeout 30;';"
echo " echo ' fastcgi_param HTTPS off;';"
echo " echo ' }';" echo " echo ' }';"
echo " echo '';" echo " echo '';"
else else
@ -737,7 +743,11 @@ echo " echo ' # Location';"
echo " echo ' location / {'; } >> \"\$${app_name}_nginx_site\"" echo " echo ' location / {'; } >> \"\$${app_name}_nginx_site\""
echo " nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'" echo " nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
if [ ! $app_daemon ]; then if [ ! $app_daemon ]; then
if [[ "$app_php" != 'yes' ]]; then
echo " { echo \" try_files \\\$uri \\\$uri/ index.html;\";" echo " { echo \" try_files \\\$uri \\\$uri/ index.html;\";"
else
echo " { echo \" try_files \\\$uri \\\$uri/ index.php?\\\$args;\";"
fi
else else
echo " echo \" proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";" echo " echo \" proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
fi fi