From 9176e313ea608c005137ef5f3be8f93281baa1e9 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Sat, 4 Jul 2020 14:09:30 -0600 Subject: [PATCH 1/7] Update about.md Remove "Golang Daemon Lead" from schrej for obvious reasons :) Add myself to the list of amazing people --- project/about.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/about.md b/project/about.md index debdb037..a127c81f 100644 --- a/project/about.md +++ b/project/about.md @@ -7,9 +7,10 @@ | [Dane Everitt](https://daneeveritt.com/) | `Tactical Fish#8008` | Project Maintainer | | [Anand Capur](https://anand.io/) | `Arcdigital#1337` | Mobile/Cloud Project Lead | | Michael Parker | `parkervcp#6789` | Egg Developer, Docker Integration | -| [Jakob Schrettenbrunner](https://schrej.net/) | `schrej#1337` | Golang Daemon Lead, Developer | +| [Jakob Schrettenbrunner](https://schrej.net/) | `schrej#1337` | Developer | | Stepan Fedotov | `Trixter#0001` | WHMCS Module Maintainer | | [Lance Pioch](https://lancepioch.com/) | `ShadowLancer#5209` | Developer | +| [Matthew Penner](https://matthewp.io/) | `matthewp#0001` | Developer | ## Community Team Pterodactyl would not be as successful as it is today without the help of our fantastic community support team. These From e20dea45e300d37cf211697664170e25a66517cc Mon Sep 17 00:00:00 2001 From: Toxicterror Date: Tue, 7 Jul 2020 11:42:54 +0200 Subject: [PATCH 2/7] Update nginx.conf Variable php version place holder for 'fastcgi_pass' --- .snippets/webservers/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.snippets/webservers/nginx.conf b/.snippets/webservers/nginx.conf index 41f7c1b5..b952c0ae 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/php7.2-fpm.sock; + fastcgi_pass unix:/run/php/-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; From 6dd276df2dda6ee7f8adc8dd77e9735e7a23ffbe Mon Sep 17 00:00:00 2001 From: Toxicterror Date: Tue, 7 Jul 2020 11:43:46 +0200 Subject: [PATCH 3/7] Update nginx-nossl.conf Variable php version place holder for 'fastcgi_pass' --- .snippets/webservers/nginx-nossl.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.snippets/webservers/nginx-nossl.conf b/.snippets/webservers/nginx-nossl.conf index e611c9df..03a60537 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/php7.2-fpm.sock; + fastcgi_pass unix:/run/php/-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; From 37d6b15bf30995e5b9d0c17fc46dbef13487fcb9 Mon Sep 17 00:00:00 2001 From: Toxicterror Date: Tue, 7 Jul 2020 11:45:58 +0200 Subject: [PATCH 4/7] Update webserver_configuration.md Mentioned the `` variable and added highlights to the nginx snippets. --- panel/0.7/webserver_configuration.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panel/0.7/webserver_configuration.md b/panel/0.7/webserver_configuration.md index 81da2c34..3a8a1c78 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 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 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/`. ### 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} +<<< @/.snippets/webservers/nginx.conf{5,11,26-27,48} Continue reading to the bottom of this section for the final steps with NGINX! ### NGINX Without SSL -<<< @/.snippets/webservers/nginx-nossl.conf{3} +<<< @/.snippets/webservers/nginx-nossl.conf{3,27} ### Enabling Configuration The final step is to enable your NGINX configuration and restart it. From c85690bf0948f5dcf1a6263260bc7d93696d2e9a Mon Sep 17 00:00:00 2001 From: Charles Morgan Date: Fri, 10 Jul 2020 19:59:40 -0400 Subject: [PATCH 5/7] Remove Ubuntu 14 warning about forever Removes the warning that should've been removed when forever was removed. Nobody should be using Ubuntu 14.... --- daemon/0.6/installing.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/daemon/0.6/installing.md b/daemon/0.6/installing.md index f3f0879a..63752533 100644 --- a/daemon/0.6/installing.md +++ b/daemon/0.6/installing.md @@ -155,10 +155,6 @@ sudo npm start ``` ### Daemonizing (using systemd) -::: warning -If you are using Ubuntu 14 you cannot use `systemd` to manage your Daemon. Please see the instructions below on using -"forever" to run the daemon. -::: Running Pterodactyl Daemon in the background is a simple task, just make sure that it runs without errors before doing this. Place the contents below in a file called `wings.service` in the `/etc/systemd/system` directory. From c12c43aaf44863e3e14b0931e27dc74a61d6006c Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 12 Jul 2020 12:01:14 -0700 Subject: [PATCH 6/7] 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. From 16f9d77d0f9554d8c233dff605df639aac181d9c Mon Sep 17 00:00:00 2001 From: ThatProgrammer <35084698+ThatProgrammerCL@users.noreply.github.com> Date: Wed, 15 Jul 2020 14:26:24 +0100 Subject: [PATCH 7/7] Remove 'warning Audit Results' warning. Due to the new command change 'npm install --only=production --no-audit --unsafe-perm' instead of 'npm install --only=production', and due to the ``--no-audit' flag, the warning isn't needed. --- daemon/0.6/installing.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/daemon/0.6/installing.md b/daemon/0.6/installing.md index 63752533..7894c0d1 100644 --- a/daemon/0.6/installing.md +++ b/daemon/0.6/installing.md @@ -127,11 +127,6 @@ curl -L https://github.com/pterodactyl/daemon/releases/download/v0.6.13/daemon.t Finally, we need to install the dependencies that allow the Daemon to run properly. This command will most likely take a few minutes to run, please do not interrupt it. -::: warning Audit Results -You may see output along the lines of "found 14 vulnerabilities (6 low, 3 moderate, 5 high) in 927 scanned packages". -You can safely ignore this output. Do not run the audit fix command, you _will_ break your Daemon. -::: - ``` bash npm install --only=production --no-audit --unsafe-perm ```