From c12c43aaf44863e3e14b0931e27dc74a61d6006c Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 12 Jul 2020 12:01:14 -0700 Subject: [PATCH] Revert "Variable for 'fastcgi_pass' in webserver config" --- .snippets/webservers/nginx-nossl.conf | 2 +- .snippets/webservers/nginx.conf | 2 +- panel/0.7/webserver_configuration.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.snippets/webservers/nginx-nossl.conf b/.snippets/webservers/nginx-nossl.conf index 03a60537..e611c9df 100644 --- a/.snippets/webservers/nginx-nossl.conf +++ b/.snippets/webservers/nginx-nossl.conf @@ -24,7 +24,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php/-fpm.sock; + fastcgi_pass unix:/run/php/php7.2-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; diff --git a/.snippets/webservers/nginx.conf b/.snippets/webservers/nginx.conf index b952c0ae..41f7c1b5 100644 --- a/.snippets/webservers/nginx.conf +++ b/.snippets/webservers/nginx.conf @@ -45,7 +45,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php/-fpm.sock; + fastcgi_pass unix:/run/php/php7.2-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; diff --git a/panel/0.7/webserver_configuration.md b/panel/0.7/webserver_configuration.md index 3a8a1c78..81da2c34 100644 --- a/panel/0.7/webserver_configuration.md +++ b/panel/0.7/webserver_configuration.md @@ -8,8 +8,8 @@ users by default. ::: ## NGINX -You should paste the contents of the file below, replacing `` with your domain name being used and `` with the php version -being used in a file called `pterodactyl.conf` and place it in `/etc/nginx/sites-available/`, or — if on CentOS, `/etc/nginx/conf.d/`. +You should paste the contents of the file below, replacing `` with your domain name being used in a file called +`pterodactyl.conf` and place it in `/etc/nginx/sites-available/`, or — if on CentOS, `/etc/nginx/conf.d/`. ### NGINX With SSL This configuration assumes that you will be using SSL on both the Panel and Daemons for significantly improved communication @@ -20,13 +20,13 @@ Let's Encrypt. When using the SSL configuration you MUST create SSL certificates, otherwise your NGINX will fail to start. See [Creating SSL Certificates](/tutorials/creating_ssl_certificates.html) documentation page for how to create these certificates before continuing. ::: -<<< @/.snippets/webservers/nginx.conf{5,11,26-27,48} +<<< @/.snippets/webservers/nginx.conf{5,11,26-27} Continue reading to the bottom of this section for the final steps with NGINX! ### NGINX Without SSL -<<< @/.snippets/webservers/nginx-nossl.conf{3,27} +<<< @/.snippets/webservers/nginx-nossl.conf{3} ### Enabling Configuration The final step is to enable your NGINX configuration and restart it.