From 5a904851fc263aef55717500ed6980039aaff4bb Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 18:14:25 +0000 Subject: [PATCH 1/4] php-fpm conf incorrect in nginx --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 87ee77e..44389f2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location ^~ YNH_WWW_PATH { location ~* \.php$ { fastcgi_split_path_info ^(.+.php)(/.+)$; - fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_ROOTAPP.sock; + fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param HTTP_PROXY ""; # Fix for https://httpoxy.org/ vulnerability From b0c60acc830b95a71b86bf908ee49d7c603900b9 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 18:15:33 +0000 Subject: [PATCH 2/4] Adjust nginx conf in install script --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index f7b8fbb..5ceb4e3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,6 +43,7 @@ else fi sed -i "s@YNH_WWW_PATH@$path@g" $nginxconf sed -i "s@YNH_WWW_FINALPATH@$final_path@g" $nginxconf +sed -i "s@YNH_WWW_APP@$final_path@g" $nginxconf sudo cp $nginxconf /etc/nginx/conf.d/$domain.d/$app.conf # If a dedicated php-fpm process is used: From 6a381c5588c60b551cf289114b53a4e18e9f31e7 Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 22 Feb 2017 18:16:18 +0000 Subject: [PATCH 3/4] Adjust nginx conf in upgrade script --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index b676320..930a602 100644 --- a/scripts/install +++ b/scripts/install @@ -115,6 +115,7 @@ else fi sed -i "s@YNH_WWW_PATH@$path@g" $nginxconf sed -i "s@YNH_WWW_FINALPATH@$final_path@g" $nginxconf +sed -i "s@YNH_WWW_APP@$final_path@g" $nginxconf sudo cp $nginxconf /etc/nginx/conf.d/$domain.d/$app.conf ### PHP ### From 73424a07533e69bd9b910ecf383aa8249710efc3 Mon Sep 17 00:00:00 2001 From: Titus PiJean Date: Wed, 22 Feb 2017 20:10:14 +0100 Subject: [PATCH 4/4] Update install $final_path -> $app --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 930a602..e4f37eb 100644 --- a/scripts/install +++ b/scripts/install @@ -115,7 +115,7 @@ else fi sed -i "s@YNH_WWW_PATH@$path@g" $nginxconf sed -i "s@YNH_WWW_FINALPATH@$final_path@g" $nginxconf -sed -i "s@YNH_WWW_APP@$final_path@g" $nginxconf +sed -i "s@YNH_WWW_APP@$app@g" $nginxconf sudo cp $nginxconf /etc/nginx/conf.d/$domain.d/$app.conf ### PHP ###