From 82ee8d51516379fc5ad00b92785c819ff01b5de0 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Sat, 2 Sep 2023 15:09:42 +0300 Subject: [PATCH 01/35] Use packages instead of the installer as not supported --- community/customization/panel.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index 78856e0ff..680c4ec38 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -17,13 +17,16 @@ The build tools require NodeJS, yarn is used as the package manager. ```bash # Ubuntu/Debian -curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - +sudo mkdir -p /etc/apt/keyrings +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list + +apt update apt install -y nodejs # CentOS -curl -sL https://rpm.nodesource.com/setup_16.x | sudo -E bash - -sudo yum install -y nodejs yarn # CentOS 7 -sudo dnf install -y nodejs yarn # CentOS 8 +sudo yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y +sudo yum install nodejs -y ``` Install required javascript packages. From d5b51d8b675769ca50029b4772759fd36b3fd71d Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Sun, 3 Sep 2023 10:17:43 +0300 Subject: [PATCH 02/35] Change the branch as the develop branch doesn't have the file --- community/customization/panel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index 680c4ec38..53675fbd7 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -4,7 +4,7 @@ Do **not** run the following steps on your production nodes. ::: -Instructions on how to build the panel are also available in the [BUILDING.md](https://github.com/pterodactyl/panel/blob/develop/BUILDING.md) file. +Instructions on how to build the panel are also available in the [BUILDING.md](https://github.com/pterodactyl/panel/blob/v1.11.3/BUILDING.md) file. The frontend of the Panel is built with React. Any changes to the source files require to recompile it. This also applies to style sheets. The following sections explain how to do so. From 3166800cf611dcc30e07094c9bd13ca17d7195f0 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Mon, 4 Sep 2023 22:10:16 +0300 Subject: [PATCH 03/35] Use "1.0-develop" branch instead of a release version --- community/customization/panel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index 53675fbd7..be7245198 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -4,7 +4,7 @@ Do **not** run the following steps on your production nodes. ::: -Instructions on how to build the panel are also available in the [BUILDING.md](https://github.com/pterodactyl/panel/blob/v1.11.3/BUILDING.md) file. +Instructions on how to build the panel are also available in the [BUILDING.md](https://github.com/pterodactyl/panel/blob/1.0-develop/BUILDING.md) file. The frontend of the Panel is built with React. Any changes to the source files require to recompile it. This also applies to style sheets. The following sections explain how to do so. From 28ab8d30181e0cc1fdc96001319af6761f56816e Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Wed, 27 Sep 2023 19:08:58 +0300 Subject: [PATCH 04/35] Add sudo to apt commands --- community/customization/panel.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index be7245198..6f3402f6d 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -21,8 +21,8 @@ sudo mkdir -p /etc/apt/keyrings curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list -apt update -apt install -y nodejs +sudo apt update +sudo apt install -y nodejs # CentOS sudo yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y From c6b86474165afe930ce9fdbc59c053347777a3af Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:33:18 +0300 Subject: [PATCH 05/35] Update sponsors --- project/about.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/project/about.md b/project/about.md index 535142e99..37369a1b2 100644 --- a/project/about.md +++ b/project/about.md @@ -24,17 +24,17 @@ members can be found in our Discord server and are distinguished with a yellow u The following companies help to fund Pterodactyl's development. [Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi) -| Company | About | -|-----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [**WISP**](https://wisp.gg) | Extra features. | -| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. | -| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. | -| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! | -| [**Skynode**](https://www.skynode.pro/) | Skynode provides blazing fast game servers along with a top-notch user experience. Whatever our clients are looking for, we're able to provide it! | -| [**VibeGAMES**](https://vibegames.net/) | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa. | -| [**Pterodactyl Market**](https://pterodactylmarket.com/) | Pterodactyl Market is a one-and-stop shop for Pterodactyl. In our market, you can find Add-ons, Themes, Eggs, and more for Pterodactyl. | -| [**UltraServers**](https://ultraservers.com/) | Deploy premium games hosting with the click of a button. Manage and swap games with ease and let us take care of the rest. We currently support Minecraft, Rust, ARK, 7 Days to Die, Garys MOD, CS:GO, Satisfactory and others. | -| [**Realms Hosting**](https://realmshosting.com/) | Want to build your Gaming Empire? Use Realms Hosting today to kick start your game server hosting with outstanding DDOS Protection, 24/7 Support, Cheap Prices and a Custom Control Panel. | | +| Company | About | +|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| [**WISP**](https://wisp.gg) | Extra features. | +| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. | +| [**WemX**](https://wemx.net/) | WemX helps automate your hosting company or SaaS business by automating billing, user management, authentication, and much more. | +| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. | +| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! | +| [**VibeGAMES**](https://vibegames.net/) | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa. | +| [**DutchIS**](https://dutchis.net?ref=pterodactyl) | DutchIS provides instant infrastructure such as pay per use VPS hosting. Start your game hosting journey on DutchIS. | +| [**Skoali**](https://skoali.com/) | Skoali is a French company that hosts game servers and other types of services (VPS, WEB, Dedicated servers, ...). We also have a free plan for Minecraft and Garry's Mod. | +| [**Rabbit Computing**](https://www.rabbitcomputing.com/link.php?id=5) | Rabbit Computing offers powerful VPS servers, highly available game hosting, and fully unlimited web hosting. Use code README for 20% off your first three months! | ## License From 7d885a0e3157fa56e850459f3a2a2e5fb39b7795 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:33:54 +0300 Subject: [PATCH 06/35] Avoid having to update the license each year --- .vuepress/theme/Home.vue | 2 +- LICENSE | 2 +- README.md | 2 +- project/about.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vuepress/theme/Home.vue b/.vuepress/theme/Home.vue index ee60bc380..b45d3c44a 100644 --- a/.vuepress/theme/Home.vue +++ b/.vuepress/theme/Home.vue @@ -146,7 +146,7 @@ -
MIT Licensed | Pterodactyl® Copyright © 2015 - 2022 Dane Everitt & contributors.
+
MIT Licensed | Pterodactyl® Copyright © Dane Everitt and contributors
diff --git a/LICENSE b/LICENSE index 91897617c..d3d51a667 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Pterodactyl +Copyright © Pterodactyl Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 90805c9e2..17fa96267 100644 --- a/README.md +++ b/README.md @@ -10,5 +10,5 @@ features: details: Built on a modern stack utilizing the best design practices that make it easy to jump in and make modifications. - title: Docker to the Core details: All servers run in isolated Docker containers that limit attack vectors, provide strict resource limits, and provide environments tailored to each specific game. -footer: MIT Licensed | Copyright © 2015 - 2018 Dane Everitt & Contributors +footer: MIT Licensed | Copyright © Dane Everitt and contributors --- diff --git a/project/about.md b/project/about.md index 37369a1b2..5c738e90b 100644 --- a/project/about.md +++ b/project/about.md @@ -38,7 +38,7 @@ The following companies help to fund Pterodactyl's development. [Interested in b ## License -Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors. +Pterodactyl® Copyright © Dane Everitt and contributors. Code released under the [MIT License](https://github.com/pterodactyl/panel/blob/develop/LICENSE.md). From fb785bb975c21dd9c8c0aa1296f6d6e5edd8f491 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:55:56 +0300 Subject: [PATCH 07/35] Actually use a note --- panel/1.0/updating.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/panel/1.0/updating.md b/panel/1.0/updating.md index 1a560d06d..ce25adb1f 100644 --- a/panel/1.0/updating.md +++ b/panel/1.0/updating.md @@ -24,7 +24,9 @@ most cases your base Wings version should match that of your Panel. | 1.10.x | 1.7.x | | 7.4, 8.0, 8.1 | | **1.11.x** | **1.11.x** | ✅ | 8.0, **8.1** (8.0 deprecated) | -_NOTE: There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings._ +::: tip Wings releases +There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings. +::: ## Update Dependencies From 04af6c4cad53178dc3f657cfe7e590016c4d75d2 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:57:17 +0300 Subject: [PATCH 08/35] Remove useless commas --- panel/1.0/updating.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/1.0/updating.md b/panel/1.0/updating.md index ce25adb1f..8a4ba151a 100644 --- a/panel/1.0/updating.md +++ b/panel/1.0/updating.md @@ -138,10 +138,10 @@ The last step is to set the proper owner of the files to be the user that runs y is `www-data` but can vary from system to system — sometimes being `nginx`, `caddy`, `apache`, or even `nobody`. ```bash -# If using NGINX or Apache (not on CentOS): +# If using NGINX or Apache (not on CentOS) chown -R www-data:www-data /var/www/pterodactyl/* -# If using NGINX on CentOS: +# If using NGINX on CentOS chown -R nginx:nginx /var/www/pterodactyl/* # If using Apache on CentOS From f8e5cf22f9e19ee8eba9fd1f279a8d4d5586fca8 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:58:33 +0300 Subject: [PATCH 09/35] Remove empty white lines in non SSL configs --- .snippets/webservers/nginx-php8.1-nossl.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.snippets/webservers/nginx-php8.1-nossl.conf b/.snippets/webservers/nginx-php8.1-nossl.conf index 6d4f4081a..319e8043e 100644 --- a/.snippets/webservers/nginx-php8.1-nossl.conf +++ b/.snippets/webservers/nginx-php8.1-nossl.conf @@ -3,7 +3,6 @@ server { listen 80; server_name ; - root /var/www/pterodactyl/public; index index.html index.htm index.php; charset utf-8; From 830d6fc361ae7508cdee235af030fa2414ffef81 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 22:58:56 +0300 Subject: [PATCH 10/35] Remove useless comment as it exists on the Documentation --- .snippets/webservers/nginx-php8.1-nossl.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.snippets/webservers/nginx-php8.1-nossl.conf b/.snippets/webservers/nginx-php8.1-nossl.conf index 319e8043e..37feaf746 100644 --- a/.snippets/webservers/nginx-php8.1-nossl.conf +++ b/.snippets/webservers/nginx-php8.1-nossl.conf @@ -1,5 +1,4 @@ server { - # Replace the example with your domain name or IP address listen 80; server_name ; From 12be1f75516ca2c6e755a059b516a60c2d02dbfe Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 23:00:05 +0300 Subject: [PATCH 11/35] Use 4 spaces instead of 2 for apache configs --- .snippets/webservers/apache-nossl.conf | 24 ++++++++--------- .snippets/webservers/apache.conf | 36 +++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.snippets/webservers/apache-nossl.conf b/.snippets/webservers/apache-nossl.conf index ec3f68b45..22a4a5677 100644 --- a/.snippets/webservers/apache-nossl.conf +++ b/.snippets/webservers/apache-nossl.conf @@ -1,14 +1,14 @@ - ServerName - DocumentRoot "/var/www/pterodactyl/public" - - AllowEncodedSlashes On - - php_value upload_max_filesize 100M - php_value post_max_size 100M - - - AllowOverride all - Require all granted - + ServerName + DocumentRoot "/var/www/pterodactyl/public" + + AllowEncodedSlashes On + + php_value upload_max_filesize 100M + php_value post_max_size 100M + + + AllowOverride all + Require all granted + diff --git a/.snippets/webservers/apache.conf b/.snippets/webservers/apache.conf index ac1b506f5..aa92505f6 100644 --- a/.snippets/webservers/apache.conf +++ b/.snippets/webservers/apache.conf @@ -1,26 +1,26 @@ - ServerName - - RewriteEngine On - RewriteCond %{HTTPS} !=on - RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] + ServerName + + RewriteEngine On + RewriteCond %{HTTPS} !=on + RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] - ServerName - DocumentRoot "/var/www/pterodactyl/public" + ServerName + DocumentRoot "/var/www/pterodactyl/public" + + AllowEncodedSlashes On - AllowEncodedSlashes On - - php_value upload_max_filesize 100M - php_value post_max_size 100M + php_value upload_max_filesize 100M + php_value post_max_size 100M - - Require all granted - AllowOverride all - + + Require all granted + AllowOverride all + - SSLEngine on - SSLCertificateFile /etc/letsencrypt/live//fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live//privkey.pem + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live//fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live//privkey.pem From 328aed422ca4e79a2028e63fa887f7f123890f45 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Tue, 17 Oct 2023 23:12:41 +0300 Subject: [PATCH 12/35] Modify the links in the banner --- .vuepress/theme/Layout.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.vuepress/theme/Layout.vue b/.vuepress/theme/Layout.vue index 5ce4e23fc..e399d8ce6 100644 --- a/.vuepress/theme/Layout.vue +++ b/.vuepress/theme/Layout.vue @@ -2,11 +2,12 @@
-

- Stand with Ukraine 🇺🇦  - Donate - Today. -

+
+ Stand with Ukraine 🇺🇦 + Learn + • + Donate +
Date: Sun, 22 Oct 2023 15:36:58 +0300 Subject: [PATCH 13/35] Update getting_started.md --- panel/1.0/getting_started.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index a6082166b..ecc8f648b 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -28,7 +28,20 @@ this software on an OpenVZ based system you will — most likely — not | **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | | | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | | **CentOS** | 7 | :white_check_mark: | Extra repos are required. | -| | 8 | :white_check_mark: | Note that CentOS 8 is EOL. Use Rocky or Alma Linux. | +| **Rocky Linux** | 8 | :white_check_mark: | Extra repos are required. | +| | 9 | :white_check_mark: | | +| **AlmaLinux** | 8 | :white_check_mark: | Extra repos are required. | +| | 9 | :white_check_mark: | | +| **Debian** | 11 | :white_check_mark: | | +| | 12 | :white_check_mark: | | + +| Operating System | Version | Supported | Notes | +|------------------|---------|:------------------:|-------------------------------------------------------------| +| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | +| | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | +| **RHEL** | 7 | :white_check_mark: | CentOS. Extra repos are required. | +| | 8 | :white_check_mark: | Rocky Linux and AlmaLinux. Extra repos are required. | +| | 9 | :white_check_mark: | Rocky Linux and AlmaLinux. Extra repos are required. | | **Debian** | 11 | :white_check_mark: | | | | 12 | :white_check_mark: | | From e2846f1d5ea0d4b31dd7e30b7fbe04172c40a7c0 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 7 Jul 2024 21:49:54 +0800 Subject: [PATCH 14/35] Add robots noindex tag to all panel 0.7 and daemon 0.6 pages --- daemon/0.6/configuration.md | 5 +++++ daemon/0.6/debian_8_docker.md | 5 +++++ daemon/0.6/installing.md | 5 +++++ daemon/0.6/kernel_modifications.md | 5 +++++ daemon/0.6/standalone_sftp.md | 5 +++++ daemon/0.6/upgrade/0.4_to_0.5.md | 5 +++++ daemon/0.6/upgrade/0.5.md | 5 +++++ daemon/0.6/upgrade/0.5_to_0.6.md | 5 +++++ daemon/0.6/upgrade/0.6.md | 5 +++++ daemon/0.6/upgrading.md | 5 +++++ panel/0.7/configuration.md | 5 +++++ panel/0.7/getting_started.md | 5 +++++ panel/0.7/troubleshooting.md | 5 +++++ panel/0.7/upgrade/0.6_to_0.7.md | 5 +++++ panel/0.7/upgrading.md | 5 +++++ panel/0.7/webserver_configuration.md | 5 +++++ 16 files changed, 80 insertions(+) diff --git a/daemon/0.6/configuration.md b/daemon/0.6/configuration.md index 5a8f5258b..07699525c 100644 --- a/daemon/0.6/configuration.md +++ b/daemon/0.6/configuration.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Additional Configuration ::: danger This Software is Abandoned diff --git a/daemon/0.6/debian_8_docker.md b/daemon/0.6/debian_8_docker.md index 8d9013f02..d615bbfb8 100644 --- a/daemon/0.6/debian_8_docker.md +++ b/daemon/0.6/debian_8_docker.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Docker on Debian 8 [[toc]] diff --git a/daemon/0.6/installing.md b/daemon/0.6/installing.md index d912d4006..1bfc64e48 100644 --- a/daemon/0.6/installing.md +++ b/daemon/0.6/installing.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Installation ::: danger This Software is Abandoned diff --git a/daemon/0.6/kernel_modifications.md b/daemon/0.6/kernel_modifications.md index 753fa4941..7dba27a9d 100644 --- a/daemon/0.6/kernel_modifications.md +++ b/daemon/0.6/kernel_modifications.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Kernel Modifications [[toc]] diff --git a/daemon/0.6/standalone_sftp.md b/daemon/0.6/standalone_sftp.md index 28256c45a..37d39c315 100644 --- a/daemon/0.6/standalone_sftp.md +++ b/daemon/0.6/standalone_sftp.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Standalone SFTP Server ::: danger This Software is Abandoned diff --git a/daemon/0.6/upgrade/0.4_to_0.5.md b/daemon/0.6/upgrade/0.4_to_0.5.md index f3ac63393..4f31f0f7a 100644 --- a/daemon/0.6/upgrade/0.4_to_0.5.md +++ b/daemon/0.6/upgrade/0.4_to_0.5.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.4.X to 0.5.X ::: danger This Software is Abandoned diff --git a/daemon/0.6/upgrade/0.5.md b/daemon/0.6/upgrade/0.5.md index 0675bbc25..3abaec35b 100644 --- a/daemon/0.6/upgrade/0.5.md +++ b/daemon/0.6/upgrade/0.5.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.5 Series ::: danger This Software is Abandoned diff --git a/daemon/0.6/upgrade/0.5_to_0.6.md b/daemon/0.6/upgrade/0.5_to_0.6.md index 0e83386c7..601b584c7 100644 --- a/daemon/0.6/upgrade/0.5_to_0.6.md +++ b/daemon/0.6/upgrade/0.5_to_0.6.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.5.X to 0.6.X ::: danger This Software is Abandoned diff --git a/daemon/0.6/upgrade/0.6.md b/daemon/0.6/upgrade/0.6.md index 99fda2343..e0ca19513 100644 --- a/daemon/0.6/upgrade/0.6.md +++ b/daemon/0.6/upgrade/0.6.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.6 Series ::: danger This Software is Abandoned diff --git a/daemon/0.6/upgrading.md b/daemon/0.6/upgrading.md index 669f5e0c7..c7e79c3a6 100644 --- a/daemon/0.6/upgrading.md +++ b/daemon/0.6/upgrading.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading ::: danger This Software is Abandoned diff --git a/panel/0.7/configuration.md b/panel/0.7/configuration.md index 605cc7610..868ae86a2 100644 --- a/panel/0.7/configuration.md +++ b/panel/0.7/configuration.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Environment Configuration [[toc]] diff --git a/panel/0.7/getting_started.md b/panel/0.7/getting_started.md index 900894ae0..d9a571565 100644 --- a/panel/0.7/getting_started.md +++ b/panel/0.7/getting_started.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Getting Started ::: danger This Version is End-of-Life diff --git a/panel/0.7/troubleshooting.md b/panel/0.7/troubleshooting.md index 1039f76ad..979926cf4 100644 --- a/panel/0.7/troubleshooting.md +++ b/panel/0.7/troubleshooting.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Troubleshooting [[toc]] diff --git a/panel/0.7/upgrade/0.6_to_0.7.md b/panel/0.7/upgrade/0.6_to_0.7.md index db1fae77c..d78b292df 100644 --- a/panel/0.7/upgrade/0.6_to_0.7.md +++ b/panel/0.7/upgrade/0.6_to_0.7.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.6 to 0.7 ::: danger This Version is End-of-Life diff --git a/panel/0.7/upgrading.md b/panel/0.7/upgrading.md index 261c8507b..a562b6809 100644 --- a/panel/0.7/upgrading.md +++ b/panel/0.7/upgrading.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading Upgrading the Panel is a relatively simple process. Below you will find a list of articles that will walk you through the upgrade process for each version of the software. diff --git a/panel/0.7/webserver_configuration.md b/panel/0.7/webserver_configuration.md index 3b50662fb..3822ead5e 100644 --- a/panel/0.7/webserver_configuration.md +++ b/panel/0.7/webserver_configuration.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Webserver Configuration ::: danger This Version is End-of-Life From 96fd0dc824b19b119a38367eea8e9c80f54f171a Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 7 Jul 2024 23:08:49 +0800 Subject: [PATCH 15/35] Add missing change for noindex --- panel/0.7/upgrade/0.7.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/panel/0.7/upgrade/0.7.md b/panel/0.7/upgrade/0.7.md index 7539adb00..7ae6c5699 100644 --- a/panel/0.7/upgrade/0.7.md +++ b/panel/0.7/upgrade/0.7.md @@ -1,3 +1,8 @@ +--- +meta: + - name: robots + content: noindex +--- # Upgrading 0.7 Series ::: danger This Version is End-of-Life From 73917cfb8ebfd1f2377c7b53452802b7bcf23ffd Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Sun, 7 Jul 2024 23:10:17 +0800 Subject: [PATCH 16/35] Revert "Use packages instead of scripts for installing NodeJS (#542)" Reverting as nodesource are now supporting their install scripts again. --- community/customization/panel.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index 6f3402f6d..c2718230b 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -17,16 +17,13 @@ The build tools require NodeJS, yarn is used as the package manager. ```bash # Ubuntu/Debian -sudo mkdir -p /etc/apt/keyrings -curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list - -sudo apt update -sudo apt install -y nodejs +curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - +apt install -y nodejs # CentOS -sudo yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y -sudo yum install nodejs -y +curl -sL https://rpm.nodesource.com/setup_16.x | sudo -E bash - +sudo yum install -y nodejs yarn # CentOS 7 +sudo dnf install -y nodejs yarn # CentOS 8 ``` Install required javascript packages. From e9744ec714fa9a016ecc527625595265bee0dab8 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 00:43:58 +0800 Subject: [PATCH 17/35] Update PHP versions --- panel/1.0/getting_started.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index ecc8f648b..a3ddfb619 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -47,7 +47,7 @@ this software on an OpenVZ based system you will — most likely — not ## Dependencies -* PHP `8.0` or `8.1` (recommended) with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip`, and `fpm` if you are planning to use NGINX. +* PHP `8.1`,`8.2`,`8.3` (`8.3` (recommended) with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip`, and `fpm` if you are planning to use NGINX. * MySQL `5.7.22` and higher (MySQL `8` recommended) **or** MariaDB `10.2` and higher. * Redis (`redis-server`) * A webserver (Apache, NGINX, Caddy, etc.) @@ -80,7 +80,7 @@ curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | sudo bash apt update # Install Dependencies -apt -y install php8.1 php8.1-{common,cli,gd,mysql,mbstring,bcmath,xml,fpm,curl,zip} mariadb-server nginx tar unzip git redis-server +apt -y install php8.3 php8.3-{common,cli,gd,mysql,mbstring,bcmath,xml,fpm,curl,zip} mariadb-server nginx tar unzip git redis-server ``` ### Installing Composer From 91ec18d489c579f9b39765070ba2157b21fbf15c Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 01:07:46 +0800 Subject: [PATCH 18/35] Update panels supported OS versions --- panel/1.0/getting_started.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index a3ddfb619..e5dbfe259 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -27,21 +27,9 @@ this software on an OpenVZ based system you will — most likely — not |------------------|---------|:------------------:|-------------------------------------------------------------| | **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | | | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | -| **CentOS** | 7 | :white_check_mark: | Extra repos are required. | -| **Rocky Linux** | 8 | :white_check_mark: | Extra repos are required. | +| | 24.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | +| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | Extra repos are required. | | | 9 | :white_check_mark: | | -| **AlmaLinux** | 8 | :white_check_mark: | Extra repos are required. | -| | 9 | :white_check_mark: | | -| **Debian** | 11 | :white_check_mark: | | -| | 12 | :white_check_mark: | | - -| Operating System | Version | Supported | Notes | -|------------------|---------|:------------------:|-------------------------------------------------------------| -| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | -| | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | -| **RHEL** | 7 | :white_check_mark: | CentOS. Extra repos are required. | -| | 8 | :white_check_mark: | Rocky Linux and AlmaLinux. Extra repos are required. | -| | 9 | :white_check_mark: | Rocky Linux and AlmaLinux. Extra repos are required. | | **Debian** | 11 | :white_check_mark: | | | | 12 | :white_check_mark: | | From d9c77aabaa50aad9775eb739977eb5f8e19264ea Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 01:35:23 +0800 Subject: [PATCH 19/35] Fix some PHP version formatting issues --- panel/1.0/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index e5dbfe259..f04879903 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -35,7 +35,7 @@ this software on an OpenVZ based system you will — most likely — not ## Dependencies -* PHP `8.1`,`8.2`,`8.3` (`8.3` (recommended) with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip`, and `fpm` if you are planning to use NGINX. +* PHP `8.1`, `8.2`, or `8.3` (recommended) with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip`, and `fpm` if you are planning to use NGINX. * MySQL `5.7.22` and higher (MySQL `8` recommended) **or** MariaDB `10.2` and higher. * Redis (`redis-server`) * A webserver (Apache, NGINX, Caddy, etc.) From c304ab65e97500117b7952cb830ba5e7e2ada222 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 03:21:19 +0800 Subject: [PATCH 20/35] Revert "Remove useless comment as it exists on the Documentation" This reverts commit 830d6fc361ae7508cdee235af030fa2414ffef81. --- .snippets/webservers/nginx-php8.1-nossl.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.snippets/webservers/nginx-php8.1-nossl.conf b/.snippets/webservers/nginx-php8.1-nossl.conf index 37feaf746..319e8043e 100644 --- a/.snippets/webservers/nginx-php8.1-nossl.conf +++ b/.snippets/webservers/nginx-php8.1-nossl.conf @@ -1,4 +1,5 @@ server { + # Replace the example with your domain name or IP address listen 80; server_name ; From 295a7dd2796c458937a8459f25309ce6a75a1f8e Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 03:31:41 +0800 Subject: [PATCH 21/35] Update to PHP 8.3 --- .snippets/webservers/Caddyfile | 2 +- .snippets/webservers/Caddyfile-nossl | 2 +- .snippets/webservers/nginx-php8.3-nossl.conf | 45 +++++++++++++ .snippets/webservers/nginx-php8.3.conf | 66 ++++++++++++++++++++ panel/1.0/webserver_configuration.md | 2 +- 5 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 .snippets/webservers/nginx-php8.3-nossl.conf create mode 100644 .snippets/webservers/nginx-php8.3.conf diff --git a/.snippets/webservers/Caddyfile b/.snippets/webservers/Caddyfile index 0755b23cd..c8368ef76 100644 --- a/.snippets/webservers/Caddyfile +++ b/.snippets/webservers/Caddyfile @@ -11,7 +11,7 @@ file_server - php_fastcgi unix//run/php/php8.1-fpm.sock { + php_fastcgi unix//run/php/php8.3-fpm.sock { root /var/www/pterodactyl/public index index.php diff --git a/.snippets/webservers/Caddyfile-nossl b/.snippets/webservers/Caddyfile-nossl index 4762d0348..71e0ae253 100644 --- a/.snippets/webservers/Caddyfile-nossl +++ b/.snippets/webservers/Caddyfile-nossl @@ -11,7 +11,7 @@ file_server - php_fastcgi unix//run/php/php8.1-fpm.sock { + php_fastcgi unix//run/php/php8.3-fpm.sock { root /var/www/pterodactyl/public index index.php diff --git a/.snippets/webservers/nginx-php8.3-nossl.conf b/.snippets/webservers/nginx-php8.3-nossl.conf new file mode 100644 index 000000000..0dcb0b3dc --- /dev/null +++ b/.snippets/webservers/nginx-php8.3-nossl.conf @@ -0,0 +1,45 @@ +server { + # Replace the example with your domain name or IP address + listen 80; + server_name ; + + root /var/www/pterodactyl/public; + index index.html index.htm index.php; + charset utf-8; + + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + + access_log off; + error_log /var/log/nginx/pterodactyl.app-error.log error; + + # allow larger file uploads and longer script runtimes + client_max_body_size 100m; + client_body_timeout 120s; + + sendfile off; + + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:/run/php/php8.3-fpm.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param HTTP_PROXY ""; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 300; + fastcgi_send_timeout 300; + fastcgi_read_timeout 300; + } + + location ~ /\.ht { + deny all; + } +} diff --git a/.snippets/webservers/nginx-php8.3.conf b/.snippets/webservers/nginx-php8.3.conf new file mode 100644 index 000000000..9a396a268 --- /dev/null +++ b/.snippets/webservers/nginx-php8.3.conf @@ -0,0 +1,66 @@ +server { + # Replace the example with your domain name or IP address + listen 80; + server_name ; + return 301 https://$server_name$request_uri; +} + +server { + # Replace the example with your domain name or IP address + listen 443 ssl http2; + server_name ; + + root /var/www/pterodactyl/public; + index index.php; + + access_log /var/log/nginx/pterodactyl.app-access.log; + error_log /var/log/nginx/pterodactyl.app-error.log error; + + # allow larger file uploads and longer script runtimes + client_max_body_size 100m; + client_body_timeout 120s; + + sendfile off; + + # SSL Configuration - Replace the example with your domain + ssl_certificate /etc/letsencrypt/live//fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live//privkey.pem; + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; + ssl_prefer_server_ciphers on; + + # See https://hstspreload.org/ before uncommenting the line below. + # add_header Strict-Transport-Security "max-age=15768000; preload;"; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header Content-Security-Policy "frame-ancestors 'self'"; + add_header X-Frame-Options DENY; + add_header Referrer-Policy same-origin; + + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:/run/php/php8.3-fpm.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param HTTP_PROXY ""; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 300; + fastcgi_send_timeout 300; + fastcgi_read_timeout 300; + include /etc/nginx/fastcgi_params; + } + + location ~ /\.ht { + deny all; + } +} diff --git a/panel/1.0/webserver_configuration.md b/panel/1.0/webserver_configuration.md index 35e0ebc55..88bc088fa 100644 --- a/panel/1.0/webserver_configuration.md +++ b/panel/1.0/webserver_configuration.md @@ -19,7 +19,7 @@ rm /etc/nginx/sites-enabled/default Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called `pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on CentOS, `/etc/nginx/conf.d/`. -<<< @/.snippets/webservers/nginx-php8.1.conf{5,11,26-27} +<<< @/.snippets/webservers/nginx-php8.3.conf{5,11,26-27} ### Enabling Configuration From 977025586bf5de6382d9686a4603166ccfd77d6c Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 03:33:18 +0800 Subject: [PATCH 22/35] Update some wordings --- panel/1.0/getting_started.md | 14 +++++++------- panel/1.0/webserver_configuration.md | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index f04879903..3e26968fd 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -54,14 +54,14 @@ operating system's package manager to determine the correct packages to install. # Add "add-apt-repository" command apt -y install software-properties-common curl apt-transport-https ca-certificates gnupg -# Add additional repositories for PHP, Redis, and MariaDB +# Add additional repositories for PHP (Ubuntu 20.04 and Ubuntu 22.04) LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php # Add Redis official APT repository curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list -# MariaDB repo setup script can be skipped on Ubuntu 22.04 +# MariaDB repo setup script (Ubuntu 20.04) curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | sudo bash # Update repositories list @@ -178,13 +178,13 @@ The last step in the installation process is to set the correct permissions on t use them correctly. ``` bash -# If using NGINX or Apache (not on CentOS) +# If using NGINX or Apache (not on RHEL / Rocky Linux / AlmaLinux) chown -R www-data:www-data /var/www/pterodactyl/* -# If using NGINX on CentOS +# If using NGINX on RHEL / Rocky Linux / AlmaLinux chown -R nginx:nginx /var/www/pterodactyl/* -# If using Apache on CentOS +# If using Apache on RHEL / Rocky Linux / AlmaLinux chown -R apache:apache /var/www/pterodactyl/* ``` @@ -233,8 +233,8 @@ RestartSec=5s WantedBy=multi-user.target ``` -::: tip Redis on CentOS -If you are using CentOS, you will need to replace `redis-server.service` with `redis.service` at the `After=` line in order to ensure `redis` starts before the queue worker. +::: tip Redis on RHEL / Rocky Linux / AlmaLinux +If you are using RHEL, Rocky Linux, or AlmaLinux, you will need to replace `redis-server.service` with `redis.service` at the `After=` line in order to ensure `redis` starts before the queue worker. ::: ::: tip diff --git a/panel/1.0/webserver_configuration.md b/panel/1.0/webserver_configuration.md index 88bc088fa..8d8cd36f2 100644 --- a/panel/1.0/webserver_configuration.md +++ b/panel/1.0/webserver_configuration.md @@ -17,7 +17,7 @@ rm /etc/nginx/sites-enabled/default ``` Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called -`pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on CentOS, `/etc/nginx/conf.d/`. +`pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/nginx/conf.d/`. <<< @/.snippets/webservers/nginx-php8.3.conf{5,11,26-27} @@ -26,7 +26,7 @@ Now, you should paste the contents of the file below, replacing `` with The final step is to enable your NGINX configuration and restart it. ```bash -# You do not need to symlink this file if you are using CentOS. +# You do not need to symlink this file if you are using RHEL, Rocky Linux, or AlmaLinux. sudo ln -s /etc/nginx/sites-available/pterodactyl.conf /etc/nginx/sites-enabled/pterodactyl.conf # You need to restart nginx regardless of OS. @@ -42,16 +42,16 @@ rm /etc/nginx/sites-enabled/default ``` Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called -`pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on CentOS, `/etc/nginx/conf.d/`. +`pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/nginx/conf.d/`. -<<< @/.snippets/webservers/nginx-php8.1-nossl.conf{4} +<<< @/.snippets/webservers/nginx-php8.3-nossl.conf{4} ### Enabling Configuration The final step is to enable your NGINX configuration and restart it. ```bash -# You do not need to symlink this file if you are using CentOS. +# You do not need to symlink this file if you are using RHEL, Rocky Linux, or AlmaLinux. sudo ln -s /etc/nginx/sites-available/pterodactyl.conf /etc/nginx/sites-enabled/pterodactyl.conf # You need to restart nginx regardless of OS. @@ -67,7 +67,7 @@ a2dissite 000-default.conf ``` Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called -`pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on CentOS, `/etc/httpd/conf.d/`. +`pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/httpd/conf.d/`. Note: When using Apache, make sure you have the `libapache2-mod-php` package installed or else PHP will not display on your webserver. @@ -75,11 +75,11 @@ Note: When using Apache, make sure you have the `libapache2-mod-php` package ins ### Enabling Configuration -Once you've created the file above, simply run the commands below. If you are on CentOS _you do not need to run the commands +Once you've created the file above, simply run the commands below. If you are on RHEL, Rocky Linux, or AlmaLinux _you do not need to run the commands below!_ You only need to run `systemctl restart httpd`. ```bash -# You do not need to run any of these commands on CentOS +# You do not need to run any of these commands on RHEL, Rocky Linux, or AlmaLinux sudo ln -s /etc/apache2/sites-available/pterodactyl.conf /etc/apache2/sites-enabled/pterodactyl.conf sudo a2enmod rewrite sudo a2enmod ssl @@ -95,7 +95,7 @@ a2dissite 000-default.conf ``` Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called -`pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on CentOS, `/etc/httpd/conf.d/`. +`pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/httpd/conf.d/`. Note: When using Apache, make sure you have the `libapache2-mod-php` package installed or else PHP will not display on your webserver. @@ -103,11 +103,11 @@ Note: When using Apache, make sure you have the `libapache2-mod-php` package ins ### Enabling Configuration -Once you've created the file above, simply run the commands below. If you are on CentOS _you do not need to run the commands +Once you've created the file above, simply run the commands below. If you are on RHEL, Rocky Linux, or AlmaLinux _you do not need to run the commands below!_ You only need to run `systemctl restart httpd`. ```bash -# You do not need to run any of these commands on CentOS +# You do not need to run any of these commands on RHEL, Rocky Linux, or AlmaLinux sudo ln -s /etc/apache2/sites-available/pterodactyl.conf /etc/apache2/sites-enabled/pterodactyl.conf sudo a2enmod rewrite sudo systemctl restart apache2 From 3b584ac0d9d8ebe8455f4abf20355a8b3144bbfd Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 04:55:32 +0800 Subject: [PATCH 23/35] Specify the php version when installing the apache php module --- panel/1.0/webserver_configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/1.0/webserver_configuration.md b/panel/1.0/webserver_configuration.md index 8d8cd36f2..e035d5637 100644 --- a/panel/1.0/webserver_configuration.md +++ b/panel/1.0/webserver_configuration.md @@ -69,7 +69,7 @@ a2dissite 000-default.conf Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called `pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/httpd/conf.d/`. -Note: When using Apache, make sure you have the `libapache2-mod-php` package installed or else PHP will not display on your webserver. +Note: When using Apache, make sure you have the `libapache2-mod-php8.3` package installed or else PHP will not display on your webserver. <<< @/.snippets/webservers/apache.conf{2,10,24-25} @@ -97,7 +97,7 @@ a2dissite 000-default.conf Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called `pterodactyl.conf` and place the file in `/etc/apache2/sites-available`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/httpd/conf.d/`. -Note: When using Apache, make sure you have the `libapache2-mod-php` package installed or else PHP will not display on your webserver. +Note: When using Apache, make sure you have the `libapache2-mod-php8.3` package installed or else PHP will not display on your webserver. <<< @/.snippets/webservers/apache-nossl.conf{2} From 5069e665c057eb506a97efbcc43997b23c1f89c9 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 18:18:06 +0800 Subject: [PATCH 24/35] Add some missing comments and correct highlighting in conf blocks --- .snippets/webservers/Caddyfile | 1 + .snippets/webservers/Caddyfile-nossl | 1 + .snippets/webservers/apache-nossl.conf | 1 + .snippets/webservers/apache.conf | 2 ++ panel/1.0/webserver_configuration.md | 10 +++++----- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.snippets/webservers/Caddyfile b/.snippets/webservers/Caddyfile index c8368ef76..4de048cd6 100644 --- a/.snippets/webservers/Caddyfile +++ b/.snippets/webservers/Caddyfile @@ -6,6 +6,7 @@ } } +# Replace the example with your domain name or IP address { root * /var/www/pterodactyl/public diff --git a/.snippets/webservers/Caddyfile-nossl b/.snippets/webservers/Caddyfile-nossl index 71e0ae253..01084e052 100644 --- a/.snippets/webservers/Caddyfile-nossl +++ b/.snippets/webservers/Caddyfile-nossl @@ -6,6 +6,7 @@ } } +# Replace the example with your domain name or IP address :80 { root * /var/www/pterodactyl/public diff --git a/.snippets/webservers/apache-nossl.conf b/.snippets/webservers/apache-nossl.conf index 22a4a5677..61c9943e1 100644 --- a/.snippets/webservers/apache-nossl.conf +++ b/.snippets/webservers/apache-nossl.conf @@ -1,4 +1,5 @@ + # Replace the example with your domain name or IP address ServerName DocumentRoot "/var/www/pterodactyl/public" diff --git a/.snippets/webservers/apache.conf b/.snippets/webservers/apache.conf index aa92505f6..8ec77b600 100644 --- a/.snippets/webservers/apache.conf +++ b/.snippets/webservers/apache.conf @@ -1,4 +1,5 @@ + # Replace the example with your domain name or IP address ServerName RewriteEngine On @@ -7,6 +8,7 @@ + # Replace the example with your domain name or IP address ServerName DocumentRoot "/var/www/pterodactyl/public" diff --git a/panel/1.0/webserver_configuration.md b/panel/1.0/webserver_configuration.md index e035d5637..03a23980e 100644 --- a/panel/1.0/webserver_configuration.md +++ b/panel/1.0/webserver_configuration.md @@ -19,7 +19,7 @@ rm /etc/nginx/sites-enabled/default Now, you should paste the contents of the file below, replacing `` with your domain name being used in a file called `pterodactyl.conf` and place the file in `/etc/nginx/sites-available/`, or — if on RHEL, Rocky Linux, or AlmaLinux, `/etc/nginx/conf.d/`. -<<< @/.snippets/webservers/nginx-php8.3.conf{5,11,26-27} +<<< @/.snippets/webservers/nginx-php8.3.conf{4,11,26-27} ### Enabling Configuration @@ -71,7 +71,7 @@ Now, you should paste the contents of the file below, replacing `` with Note: When using Apache, make sure you have the `libapache2-mod-php8.3` package installed or else PHP will not display on your webserver. -<<< @/.snippets/webservers/apache.conf{2,10,24-25} +<<< @/.snippets/webservers/apache.conf{3,12,26-27} ### Enabling Configuration @@ -99,7 +99,7 @@ Now, you should paste the contents of the file below, replacing `` with Note: When using Apache, make sure you have the `libapache2-mod-php8.3` package installed or else PHP will not display on your webserver. -<<< @/.snippets/webservers/apache-nossl.conf{2} +<<< @/.snippets/webservers/apache-nossl.conf{3} ### Enabling Configuration @@ -127,7 +127,7 @@ Then continue with an editor of your choice to write the config. You should paste the contents of the file below, replacing `` with your domain name. -<<< @/.snippets/webservers/Caddyfile{9} +<<< @/.snippets/webservers/Caddyfile{10} ::: tip If you are using Cloudflare DNS in proxy mode, refer to [this tutorial](/tutorials/creating_ssl_certificates.html#method-3:-caddy-(using-cloudflare-api)), to see how to configure Caddy to use DNS challenge for obtaining SSL certificates. @@ -157,7 +157,7 @@ You should paste the contents of the file below, replacing `` with your The only two differences are that we have suffixed the `` with `:80` and in the global config at `servers` directive, we have changed the port from `:443` to `:80`. -<<< @/.snippets/webservers/Caddyfile-nossl{9} +<<< @/.snippets/webservers/Caddyfile-nossl{10} ### Enabling Configuration From 77f91caf882c0ff302f88c49077477270800cb9a Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 21:58:15 +0800 Subject: [PATCH 25/35] Update wings OS Support table --- wings/1.0/installing.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wings/1.0/installing.md b/wings/1.0/installing.md index 5174e649a..21b61b583 100644 --- a/wings/1.0/installing.md +++ b/wings/1.0/installing.md @@ -20,8 +20,9 @@ only the versions listed below. |------------------|---------|:------------------:|-------------------------------------------------------------| | **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | | | 22.04 | :white_check_mark: | | -| **CentOS** | 7 | :white_check_mark: | | -| | 8 | :white_check_mark: | Note that CentOS 8 is EOL. Use Rocky or Alma Linux. | +| | 24.04 | :white_check_mark: | | +| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | | +| | 9 | :white_check_mark: | | | **Debian** | 11 | :white_check_mark: | | | | 12 | :white_check_mark: | | | **Windows** | All | :x: | This software will not run in Windows environments. | From 804fce4a848be5d1a068978f3478352e250601be Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 21:58:45 +0800 Subject: [PATCH 26/35] Don't show warning about running composer as root --- panel/1.0/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index 3e26968fd..cff88c0ed 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -127,7 +127,7 @@ new application encryption key. ``` bash cp .env.example .env -composer install --no-dev --optimize-autoloader +COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader # Only run the command below if you are installing this Panel for # the first time and do not have any Pterodactyl Panel data in the database. From 7bf43326ab659ea3fd72ba060502baf591867e77 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Mon, 8 Jul 2024 22:04:09 +0800 Subject: [PATCH 27/35] Remove list and just link to the docker-ce install page --- wings/1.0/installing.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wings/1.0/installing.md b/wings/1.0/installing.md index 21b61b583..5c41e2f0c 100644 --- a/wings/1.0/installing.md +++ b/wings/1.0/installing.md @@ -58,12 +58,7 @@ For a quick install of Docker CE, you can execute the command below: curl -sSL https://get.docker.com/ | CHANNEL=stable bash ``` -If you would rather do a manual installation, please reference the official Docker documentation for how to install Docker CE on your server. Some quick links -are listed below for commonly supported systems. - -- [Ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/#install-docker-ce) -- [CentOS](https://docs.docker.com/install/linux/docker-ce/centos/#install-docker-ce) -- [Debian](https://docs.docker.com/install/linux/docker-ce/debian/#install-docker-ce) +If you would rather do a manual installation, please reference the [official Docker documentation](https://docs.docker.com/engine/install/) for how to install Docker CE on your server. ::: warning Check your Kernel Please be aware that some hosts install a modified kernel that does not support important docker features. Please From 6eaf9c9339dad19069442f727d54d1fbd97fbb13 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Tue, 9 Jul 2024 02:55:43 +0800 Subject: [PATCH 28/35] Update support table on wings upgrade page --- wings/1.0/upgrading.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wings/1.0/upgrading.md b/wings/1.0/upgrading.md index 088604916..b5bd9d7c1 100644 --- a/wings/1.0/upgrading.md +++ b/wings/1.0/upgrading.md @@ -20,7 +20,7 @@ most cases your base Wings version should match that of your Panel. | 1.7.x | 1.5.x | | | 1.8.x | 1.6.x | | | 1.9.x | 1.6.x | | -| **1.10.x** | **1.7.x** | ✅ | +| 1.10.x | 1.7.x | | | **1.11.x** | **1.11.x** | ✅ | *NOTE: There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings.* From 36925416dc272e590d8724ee5d91c3da8a710c23 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Tue, 9 Jul 2024 02:56:57 +0800 Subject: [PATCH 29/35] Update panel upgrade version support and PHP versions --- panel/1.0/updating.md | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/panel/1.0/updating.md b/panel/1.0/updating.md index 8a4ba151a..8af187e0d 100644 --- a/panel/1.0/updating.md +++ b/panel/1.0/updating.md @@ -22,7 +22,7 @@ most cases your base Wings version should match that of your Panel. | 1.8.x | 1.6.x | | 7.4, 8.0, 8.1 | | 1.9.x | 1.6.x | | 7.4, 8.0, 8.1 | | 1.10.x | 1.7.x | | 7.4, 8.0, 8.1 | -| **1.11.x** | **1.11.x** | ✅ | 8.0, **8.1** (8.0 deprecated) | +| **1.11.x** | **1.11.x** | ✅ | 8.1, 8.2, **8.3** | ::: tip Wings releases There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings. @@ -30,21 +30,12 @@ There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings. ## Update Dependencies -- PHP `8.0` or `8.1` (recommended) +- PHP `8.1`, `8.2`, or `8.3` (recommended) - Composer `2.X` -::: danger PHP 7.4 -Support for PHP 7.4 has been removed with the release of 1.11.0. Please upgrade -to PHP 8.0, 8.1 or newer. -::: - -::: warning Future PHP Version Changes -**Support for PHP 8.0 is deprecated**. Please plan accordingly — PHP 8.1 or newer -will be the only supported version in 1.12 and beyond. -::: -**Before continuing**, please ensure that your system and web server configuration has been upgraded to at least PHP 8.0 by running `php -v` and Composer 2 by running `composer --version`. You -should see an output similar to the result below. If you do not see at least PHP 8.0 and Composer 2, you will need to upgrade by following +**Before continuing**, please ensure that your system and web server configuration has been upgraded to at least PHP 8.1 by running `php -v` and Composer 2 by running `composer --version`. You +should see an output similar to the result below. If you do not see at least PHP 8.1 and Composer 2, you will need to upgrade by following our [PHP Upgrade Guide](/guides/php_upgrade.md) and return to this documentation afterward. ``` From 30cbd9570646c7cf9bb06f9279df544ce0b7de2d Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Tue, 9 Jul 2024 03:07:40 +0800 Subject: [PATCH 30/35] Update php upgrade guide --- guides/php_upgrade.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/guides/php_upgrade.md b/guides/php_upgrade.md index 87025bd40..a736e3ef1 100644 --- a/guides/php_upgrade.md +++ b/guides/php_upgrade.md @@ -8,18 +8,19 @@ table below to check what version you need for your version of Pterodactyl. | 1.0.0 - 1.2.0 | 7.3, 7.4 | | 1.3.0+ | 7.4, 8.0 | | 1.8.0+ | 7.4, 8.0, 8.1 | -| 1.11.0+ | 8.0, 8.1 | +| 1.11.0 - 1.11.3 | 8.0, 8.1 | +| 1.11.4+ | 8.1, 8.2, 8.3 | ## Install PHP -In order to install PHP 8.1, you will need to run the following command. Please keep in mind different operating systems +In order to install PHP 8.3, you will need to run the following command. Please keep in mind different operating systems may have slightly different requirements for how this command is formatted. ```bash # Add additional repository for PHP add-apt-repository -y ppa:ondrej/php apt -y update -apt -y install php8.1 php8.1-{cli,gd,mysql,pdo,mbstring,tokenizer,bcmath,xml,fpm,curl,zip} +apt -y install php8.3 php8.3-{cli,gd,mysql,pdo,mbstring,tokenizer,bcmath,xml,fpm,curl,zip} ``` ## Update Composer @@ -35,14 +36,14 @@ composer self-update --2 :::: tabs ::: tab "NGINX" -After upgrading to PHP 8.1, you will most likely need to update your NGINX configuration. Your configuration file +After upgrading to PHP 8.3, you will most likely need to update your NGINX configuration. Your configuration file is most likely called `pterodactyl.conf` and located in the `/etc/nginx/sites-available/` directory, or if on CentOS, `/etc/nginx/conf.d/`. Make sure to update the path in the command below to reflect the actual location of your configuration file. ``` bash -sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.1-fpm.sock/' /etc/nginx/sites-available/pterodactyl.conf +sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.3-fpm.sock/' /etc/nginx/sites-available/pterodactyl.conf ``` Once you have edited the file run the command below to reload nginx and apply your changes. @@ -53,14 +54,14 @@ systemctl reload nginx ::: ::: tab "Apache" -Run the commands below to disable all previous PHP versions and enable PHP 8.1 when serving requests. +Run the commands below to disable all previous PHP versions and enable PHP 8.3 when serving requests. ``` bash # Hint: a2dismod = a2_disable_module 🤯 a2dismod php* # Hint: a2enmod = a2_enable_module 🤯 -a2enmod php8.1 +a2enmod php8.3 ``` From 2cb2ae62342887e48f48b9cb74d7a8b3271f56ce Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Sat, 13 Jul 2024 23:58:32 +0300 Subject: [PATCH 31/35] Add sudo to nodejs installation --- community/customization/panel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index c2718230b..dd3235646 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -18,7 +18,7 @@ The build tools require NodeJS, yarn is used as the package manager. ```bash # Ubuntu/Debian curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - -apt install -y nodejs +sudo apt install -y nodejs # CentOS curl -sL https://rpm.nodesource.com/setup_16.x | sudo -E bash - From 3850dad6d30c5726b751c9f4c651d6449ee009a0 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Sat, 13 Jul 2024 23:59:42 +0300 Subject: [PATCH 32/35] Add CentOS forks (i think) to nodejs installation --- community/customization/panel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/customization/panel.md b/community/customization/panel.md index dd3235646..22dcaffb3 100644 --- a/community/customization/panel.md +++ b/community/customization/panel.md @@ -23,7 +23,7 @@ sudo apt install -y nodejs # CentOS curl -sL https://rpm.nodesource.com/setup_16.x | sudo -E bash - sudo yum install -y nodejs yarn # CentOS 7 -sudo dnf install -y nodejs yarn # CentOS 8 +sudo dnf install -y nodejs yarn # CentOS 8, Rocky Linux 8, AlmaLinux 8 ``` Install required javascript packages. From 9e3333d2690abb8a4e2e7c15959dc75148b9b22b Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Sun, 14 Jul 2024 00:01:11 +0300 Subject: [PATCH 33/35] Update tables to match the spacing --- panel/1.0/getting_started.md | 18 +++++++++--------- wings/1.0/installing.md | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index cff88c0ed..10ae34dc5 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -23,15 +23,15 @@ Pterodactyl does not support most OpenVZ systems due to incompatibilities with D this software on an OpenVZ based system you will — most likely — not be successful. ::: -| Operating System | Version | Supported | Notes | -|------------------|---------|:------------------:|-------------------------------------------------------------| -| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | -| | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | -| | 24.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | -| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | Extra repos are required. | -| | 9 | :white_check_mark: | | -| **Debian** | 11 | :white_check_mark: | | -| | 12 | :white_check_mark: | | +| Operating System | Version | Supported | Notes | +| ---------------------------------- | ------- | :----------------: | ----------------------------------------------------------- | +| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | +| | 22.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | +| | 24.04 | :white_check_mark: | MariaDB can be installed without the repo setup script. | +| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | Extra repos are required. | +| | 9 | :white_check_mark: | | +| **Debian** | 11 | :white_check_mark: | | +| | 12 | :white_check_mark: | | ## Dependencies diff --git a/wings/1.0/installing.md b/wings/1.0/installing.md index 5c41e2f0c..b31675b7a 100644 --- a/wings/1.0/installing.md +++ b/wings/1.0/installing.md @@ -16,16 +16,16 @@ You are responsible for determining which packages may be necessary on those sys high probability that new releases of the supported OSes below will work just fine, you are not restricted to only the versions listed below. -| Operating System | Version | Supported | Notes | -|------------------|---------|:------------------:|-------------------------------------------------------------| -| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | -| | 22.04 | :white_check_mark: | | -| | 24.04 | :white_check_mark: | | -| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | | -| | 9 | :white_check_mark: | | -| **Debian** | 11 | :white_check_mark: | | -| | 12 | :white_check_mark: | | -| **Windows** | All | :x: | This software will not run in Windows environments. | +| Operating System | Version | Supported | Notes | +| ---------------------------------- | ------- | :----------------: | ----------------------------------------------------------- | +| **Ubuntu** | 20.04 | :white_check_mark: | Documentation written assuming Ubuntu 20.04 as the base OS. | +| | 22.04 | :white_check_mark: | | +| | 24.04 | :white_check_mark: | | +| **RHEL / Rocky Linux / AlmaLinux** | 8 | :white_check_mark: | | +| | 9 | :white_check_mark: | | +| **Debian** | 11 | :white_check_mark: | | +| | 12 | :white_check_mark: | | +| **Windows** | All | :x: | This software will not run in Windows environments. | ## System Requirements From 99667c596d8cb48fc374b61b16811f605941bc6f Mon Sep 17 00:00:00 2001 From: Louis Ravignot Dos Santos Date: Sat, 14 Oct 2023 10:17:23 -0700 Subject: [PATCH 34/35] Add sudo to systemctl enable --now wings Every systemctl command in the documentation has sudo before, why not this one ? --- wings/1.0/installing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wings/1.0/installing.md b/wings/1.0/installing.md index b31675b7a..db65b51e7 100644 --- a/wings/1.0/installing.md +++ b/wings/1.0/installing.md @@ -165,7 +165,7 @@ WantedBy=multi-user.target Then, run the commands below to reload systemd and start Wings. ```bash -systemctl enable --now wings +sudo systemctl enable --now wings ``` ### Node Allocations From 4321a62e44f4f7e6eb34cb5a83cee6f14c208859 Mon Sep 17 00:00:00 2001 From: PadowYT2 Date: Mon, 19 Aug 2024 21:44:11 +0300 Subject: [PATCH 35/35] Format tables --- .../config/eggs/creating_a_custom_egg.md | 20 +++--- daemon/0.6/configuration.md | 66 +++++++++---------- daemon/0.6/installing.md | 16 ++--- guides/php_upgrade.md | 14 ++-- panel/0.7/getting_started.md | 16 ++--- panel/1.0/updating.md | 28 ++++---- project/about.md | 16 ++--- wings/1.0/upgrading.md | 2 +- 8 files changed, 89 insertions(+), 89 deletions(-) diff --git a/community/config/eggs/creating_a_custom_egg.md b/community/config/eggs/creating_a_custom_egg.md index 7d4bd513c..f458960d3 100644 --- a/community/config/eggs/creating_a_custom_egg.md +++ b/community/config/eggs/creating_a_custom_egg.md @@ -191,13 +191,13 @@ They will then be visible when managing the startup for a server in both the Adm The default variables are always accessible to all eggs and don't have to be created separately. They can be used in the egg startup, install script, or the configuration file parser. -| Variable | Description | Example | -|----------|-------------|---------| -| TZ | Time Zone | `Etc/UTC` | -| STARTUP | Startup command of the egg | `java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}` | -| SERVER_MEMORY | Memory available for the server in MB | `512` | -| SERVER_IP | Default ip of the server | `127.0.0.1` | -| SERVER_PORT | Primary Server Port | `27015` | -| P_SERVER_LOCATION | Location of the server | `Example City` | -| P_SERVER_UUID | UUID of the server | `539fdca8-4a08-4551-a8d2-8ee5475b50d9` | -| P_SERVER_ALLOCATION_LIMIT | Limit of allocations allowed for the server | `0` | +| Variable | Description | Example | +| ------------------------- | ------------------------------------------- | -------------------------------------------------------------- | +| TZ | Time Zone | `Etc/UTC` | +| STARTUP | Startup command of the egg | `java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}` | +| SERVER_MEMORY | Memory available for the server in MB | `512` | +| SERVER_IP | Default ip of the server | `127.0.0.1` | +| SERVER_PORT | Primary Server Port | `27015` | +| P_SERVER_LOCATION | Location of the server | `Example City` | +| P_SERVER_UUID | UUID of the server | `539fdca8-4a08-4551-a8d2-8ee5475b50d9` | +| P_SERVER_ALLOCATION_LIMIT | Limit of allocations allowed for the server | `0` | diff --git a/daemon/0.6/configuration.md b/daemon/0.6/configuration.md index 07699525c..1a06f69ad 100644 --- a/daemon/0.6/configuration.md +++ b/daemon/0.6/configuration.md @@ -43,14 +43,14 @@ If you're seeing more servers than you expected being killed as a result of the adjustments to the settings below. Please note the configs below are in JSON dot-notation and should be expanded out into a normal JSON object. -| Setting Path | Default Value | Notes | -| ------------ | ------------- | ----- | -| `enabled` | true | Determines if the throttle (and associated values below) should be used. | -| `kill_at_count` | 5 | The number of warnings that can accumulate for a particular instance before the server process is killed. The decay time below affects how quickly this value is decreased. | -| `decay` | 10 | The number of seconds that a server process must go without triggering a data throttle warning before the throttle count begins decreasing. This loop is processed every 5 seconds and will decrement the throttle count by one when the process goes more than this number of seconds without a data throttle occurring. | -| `bytes` | 30720 | :warning: _(removed in v0.5.5)_ The maximum number of bytes of data that can be output in the defined interval before a warning occurs. | -| `lines` | 1000 | :warning: _(added in v0.5.6)_ The number of lines that can be output by the server process in the defined check interval time. By default, 5,000 lines in ~500ms results in a server process kill. | -| `check_interval_ms` | 100 | The number of milliseconds between the throttle resetting the used bytes or line count. | +| Setting Path | Default Value | Notes | +| ------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `enabled` | true | Determines if the throttle (and associated values below) should be used. | +| `kill_at_count` | 5 | The number of warnings that can accumulate for a particular instance before the server process is killed. The decay time below affects how quickly this value is decreased. | +| `decay` | 10 | The number of seconds that a server process must go without triggering a data throttle warning before the throttle count begins decreasing. This loop is processed every 5 seconds and will decrement the throttle count by one when the process goes more than this number of seconds without a data throttle occurring. | +| `bytes` | 30720 | :warning: _(removed in v0.5.5)_ The maximum number of bytes of data that can be output in the defined interval before a warning occurs. | +| `lines` | 1000 | :warning: _(added in v0.5.6)_ The number of lines that can be output by the server process in the defined check interval time. By default, 5,000 lines in ~500ms results in a server process kill. | +| `check_interval_ms` | 100 | The number of milliseconds between the throttle resetting the used bytes or line count. | Please note that all of the settings above are in the `internals.throttle.X` path. So, `enabled` is actually `internals.throttle.enabled`. @@ -94,15 +94,15 @@ The following will stop the daemon, remove the network, and start the daemon aga ``` ## Private Registries -| Setting Path | Default Value | Notes | -| ------------ | ------------- | ----- | -| `username` | _none_ | The username to use when connecting to the registry. | -| `password` | _none_ | The password associated with the account. | -| `images` | _none_ | An array of images that are associated with the private registry. | -| `auth` | _none_ | | -| `email` | _none_ | | -| `serveraddress` | _none_ | The address to the server the registry is located on. | -| `key` | _none_ | A pre-generated base64 encoded authentication string. If provided none of the above options are required. | +| Setting Path | Default Value | Notes | +| --------------- | ------------- | --------------------------------------------------------------------------------------------------------- | +| `username` | _none_ | The username to use when connecting to the registry. | +| `password` | _none_ | The password associated with the account. | +| `images` | _none_ | An array of images that are associated with the private registry. | +| `auth` | _none_ | | +| `email` | _none_ | | +| `serveraddress` | _none_ | The address to the server the registry is located on. | +| `key` | _none_ | A pre-generated base64 encoded authentication string. If provided none of the above options are required. | Please note that all of the settings above are in the `docker.registry.X` path. So, `username` is actually `docker.registry.username`. @@ -111,26 +111,26 @@ This daemon ships with a very strict security configuration designed to limit ac a large range of potential attack vectors. However, some users might need to tweak these settings, or are running on a private instance and are willing to decrease some of the security measures. -| Setting Path | Default Value | Notes | -| ------------ | ------------- | ----- | -| `ipv6` | true | Set this to false to disable IPv6 networking on the pterodactyl0 interface. | -| `internal` | false | Set this to true to prevent any external network access to all containers on the pterodactyl0 interface. | -| `enable_icc` | true | Set this to false to disallow containers to access services running on the host system's non-public IP addresses. Setting this to false does make it impossible to connect (from a container) to MySQL/Redis/etc. running on the host system without using the public IP address. | -| `enable_ip_masquerade` | true | Set this to false to disable IP Masquerading on the pterodactyl0 interface. | +| Setting Path | Default Value | Notes | +| ---------------------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `ipv6` | true | Set this to false to disable IPv6 networking on the pterodactyl0 interface. | +| `internal` | false | Set this to true to prevent any external network access to all containers on the pterodactyl0 interface. | +| `enable_icc` | true | Set this to false to disallow containers to access services running on the host system's non-public IP addresses. Setting this to false does make it impossible to connect (from a container) to MySQL/Redis/etc. running on the host system without using the public IP address. | +| `enable_ip_masquerade` | true | Set this to false to disable IP Masquerading on the pterodactyl0 interface. | Please note that all of the settings above are in the `docker.policy.network.X` path. So, `ipv6` is actually `docker.policy.network.ipv6`. ## Container Policy -| Setting Path | Default Value | Notes | -| ------------ | ------------- | ----- | -| `tmpfs` | `rw,exec,nosuid,size=50M` | These are the arguments used for mounting a `tmpfs` directory into containers to allow certain programs to run. | -| `log_driver` | none | :warning: This option was **removed** in `v0.6` and is forcibly set to `json-file`. The log driver to use for containers. We default to `none` to mitigate a potential DoS attack vector if a server were to spam log output. | -| `log_opts` | array | | -| `log_opts.max_size` | `5m` | The maximum size of the server output log file created by Docker. | -| `log_opts.max_files` | `1` | The maximum number of files that Docker will create with output from the server. | -| `readonly_root` | true | Determines if the root filesystem of the container should be readonly. | -| `securityopts` | array | An array of security options to apply to a container. The default array is provided below. | -| `cap_drop` | array | An array of linux capabilities to drop from the container (in addition to ones [dropped by docker already](https://docs.docker.com/engine/security/security/#linux-kernel-capabilities). A listing of the default array is below. | +| Setting Path | Default Value | Notes | +| -------------------- | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `tmpfs` | `rw,exec,nosuid,size=50M` | These are the arguments used for mounting a `tmpfs` directory into containers to allow certain programs to run. | +| `log_driver` | none | :warning: This option was **removed** in `v0.6` and is forcibly set to `json-file`. The log driver to use for containers. We default to `none` to mitigate a potential DoS attack vector if a server were to spam log output. | +| `log_opts` | array | | +| `log_opts.max_size` | `5m` | The maximum size of the server output log file created by Docker. | +| `log_opts.max_files` | `1` | The maximum number of files that Docker will create with output from the server. | +| `readonly_root` | true | Determines if the root filesystem of the container should be readonly. | +| `securityopts` | array | An array of security options to apply to a container. The default array is provided below. | +| `cap_drop` | array | An array of linux capabilities to drop from the container (in addition to ones [dropped by docker already](https://docs.docker.com/engine/security/security/#linux-kernel-capabilities). A listing of the default array is below. | Please note that all of the settings above are in the `docker.policy.container.X` path. So, `tmpfs` is actually `docker.policy.container.tmpfs`. diff --git a/daemon/0.6/installing.md b/daemon/0.6/installing.md index 1bfc64e48..243fe9855 100644 --- a/daemon/0.6/installing.md +++ b/daemon/0.6/installing.md @@ -20,14 +20,14 @@ This specific software is for Pterodactyl v0.7 and **must not be used for Pterod [[toc]] ## Supported Systems -| Operating System | Version | Supported | Notes | -| ---------------- | ------- | :-------: | ----- | -| **Ubuntu** | 18.04 | :white_check_mark: | Documentation written assuming Ubuntu 18.04 as the base OS. | -| | [20.04](/community/installation-guides/daemon/ubuntu2004.html) | :white_check_mark: | -| **CentOS** | [7](/community/installation-guides/daemon/centos7.html) | :warning: | Extra repos are required | -| | [8](/community/installation-guides/daemon/centos8.html) | :white_check_mark: | | -| **Debian** | [9](/community/installation-guides/daemon/debian9.html) | :white_check_mark: | | -| | [10](/community/installation-guides/daemon/debian10.html) | :white_check_mark: | | +| Operating System | Version | Supported | Notes | +| ---------------- | -------------------------------------------------------------- | :----------------: | ----------------------------------------------------------- | +| **Ubuntu** | 18.04 | :white_check_mark: | Documentation written assuming Ubuntu 18.04 as the base OS. | +| | [20.04](/community/installation-guides/daemon/ubuntu2004.html) | :white_check_mark: | +| **CentOS** | [7](/community/installation-guides/daemon/centos7.html) | :warning: | Extra repos are required | +| | [8](/community/installation-guides/daemon/centos8.html) | :white_check_mark: | | +| **Debian** | [9](/community/installation-guides/daemon/debian9.html) | :white_check_mark: | | +| | [10](/community/installation-guides/daemon/debian10.html) | :white_check_mark: | | ## System Requirements In order to run the Daemon you will need a system capable of running Docker containers. Most VPS and almost all diff --git a/guides/php_upgrade.md b/guides/php_upgrade.md index a736e3ef1..11a10a494 100644 --- a/guides/php_upgrade.md +++ b/guides/php_upgrade.md @@ -3,13 +3,13 @@ This documentation includes instructions for upgrading your system to the latest version of PHP. Please reference the table below to check what version you need for your version of Pterodactyl. -| Panel Version | PHP Version | -|---------------|---------------| -| 1.0.0 - 1.2.0 | 7.3, 7.4 | -| 1.3.0+ | 7.4, 8.0 | -| 1.8.0+ | 7.4, 8.0, 8.1 | -| 1.11.0 - 1.11.3 | 8.0, 8.1 | -| 1.11.4+ | 8.1, 8.2, 8.3 | +| Panel Version | PHP Version | +| --------------- | ------------- | +| 1.0.0 - 1.2.0 | 7.3, 7.4 | +| 1.3.0+ | 7.4, 8.0 | +| 1.8.0+ | 7.4, 8.0, 8.1 | +| 1.11.0 - 1.11.3 | 8.0, 8.1 | +| 1.11.4+ | 8.1, 8.2, 8.3 | ## Install PHP diff --git a/panel/0.7/getting_started.md b/panel/0.7/getting_started.md index d9a571565..a954179e1 100644 --- a/panel/0.7/getting_started.md +++ b/panel/0.7/getting_started.md @@ -30,14 +30,14 @@ Pterodactyl does not support most OpenVZ systems due to incompatabilities with D this software on an OpenVZ based system you will — most likely — not be successful. ::: -| Operating System | Version | Supported | Notes | -| ---------------- | ------- | :-------: | ----- | -| **Ubuntu** | 18.04 | :white_check_mark: | Documentation written assuming Ubuntu 18.04 as the base OS. | -| | [20.04](/community/installation-guides/panel/ubuntu2004.html) | :white_check_mark: | | -| **CentOS** | [7](/community/installation-guides/panel/centos7.html) | :white_check_mark: | Extra repos are required. | -| | [8](/community/installation-guides/panel/centos8.html) | :white_check_mark: | All required packages are part of the base repos. | -| **Debian** | [9](/community/installation-guides/panel/debian9.html) | :white_check_mark: | Extra repos are required. | -| | [10](/community/installation-guides/panel/debian10.html) | :white_check_mark: | All required packages are part of the base repos. | +| Operating System | Version | Supported | Notes | +| ---------------- | ------------------------------------------------------------- | :----------------: | ----------------------------------------------------------- | +| **Ubuntu** | 18.04 | :white_check_mark: | Documentation written assuming Ubuntu 18.04 as the base OS. | +| | [20.04](/community/installation-guides/panel/ubuntu2004.html) | :white_check_mark: | | +| **CentOS** | [7](/community/installation-guides/panel/centos7.html) | :white_check_mark: | Extra repos are required. | +| | [8](/community/installation-guides/panel/centos8.html) | :white_check_mark: | All required packages are part of the base repos. | +| **Debian** | [9](/community/installation-guides/panel/debian9.html) | :white_check_mark: | Extra repos are required. | +| | [10](/community/installation-guides/panel/debian10.html) | :white_check_mark: | All required packages are part of the base repos. | ## Dependencies * PHP `7.2` with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip`, and `fpm` if you are planning to use nginx diff --git a/panel/1.0/updating.md b/panel/1.0/updating.md index 8af187e0d..95f2386e1 100644 --- a/panel/1.0/updating.md +++ b/panel/1.0/updating.md @@ -9,20 +9,20 @@ Each version of Pterodactyl Panel also has a corresponding minimum version of Wi is required for it to run. Please see the chart below for how these versions line up. In most cases your base Wings version should match that of your Panel. -| Panel Version | Wings Version | Supported | PHP Versions | -| ------------- | ------------- | --------- | ----------------------------- | -| 1.0.x | 1.0.x | | 7.3, 7.4 | -| 1.1.x | 1.1.x | | 7.3, 7.4 | -| 1.2.x | 1.2.x | | 7.3, 7.4 | -| 1.3.x | 1.3.x | | 7.4, 8.0 | -| 1.4.x | 1.4.x | | 7.4, 8.0 | -| 1.5.x | 1.4.x | | 7.4, 8.0 | -| 1.6.x | 1.4.x | | 7.4, 8.0 | -| 1.7.x | 1.5.x | | 7.4, 8.0 | -| 1.8.x | 1.6.x | | 7.4, 8.0, 8.1 | -| 1.9.x | 1.6.x | | 7.4, 8.0, 8.1 | -| 1.10.x | 1.7.x | | 7.4, 8.0, 8.1 | -| **1.11.x** | **1.11.x** | ✅ | 8.1, 8.2, **8.3** | +| Panel Version | Wings Version | Supported | PHP Versions | +| ------------- | ------------- | --------- | ----------------- | +| 1.0.x | 1.0.x | | 7.3, 7.4 | +| 1.1.x | 1.1.x | | 7.3, 7.4 | +| 1.2.x | 1.2.x | | 7.3, 7.4 | +| 1.3.x | 1.3.x | | 7.4, 8.0 | +| 1.4.x | 1.4.x | | 7.4, 8.0 | +| 1.5.x | 1.4.x | | 7.4, 8.0 | +| 1.6.x | 1.4.x | | 7.4, 8.0 | +| 1.7.x | 1.5.x | | 7.4, 8.0 | +| 1.8.x | 1.6.x | | 7.4, 8.0, 8.1 | +| 1.9.x | 1.6.x | | 7.4, 8.0, 8.1 | +| 1.10.x | 1.7.x | | 7.4, 8.0, 8.1 | +| **1.11.x** | **1.11.x** | ✅ | 8.1, 8.2, **8.3** | ::: tip Wings releases There are no 1.8.x, 1.9.x, or 1.10.x releases of Wings. diff --git a/project/about.md b/project/about.md index ac09fb7ab..cc291c27b 100644 --- a/project/about.md +++ b/project/about.md @@ -4,12 +4,12 @@ ## Core Project Team -| Name | Discord Name | Primary Role | -|-----------------------------------------------|-----------------|-------------------------------------| -| [Dane Everitt](https://daneeveritt.com/) | `.tacticalfish` | Founder & Former Project Maintainer | -| [Matthew Penner](https://matthewp.io/) | `matthewp` | Project Maintainer | -| Stepan Fedotov | `trixter` | WHMCS Module Maintainer | -| Michael Parker | `parkervcp` | Egg Developer, Docker Integration | +| Name | Discord Name | Primary Role | +| ---------------------------------------- | --------------- | ----------------------------------- | +| [Dane Everitt](https://daneeveritt.com/) | `.tacticalfish` | Founder & Former Project Maintainer | +| [Matthew Penner](https://matthewp.io/) | `matthewp` | Project Maintainer | +| Stepan Fedotov | `trixter` | WHMCS Module Maintainer | +| Michael Parker | `parkervcp` | Egg Developer, Docker Integration | Members of the project team have a red username in our Discord server. @@ -22,8 +22,8 @@ members can be found in our Discord server and are distinguished with a yellow u The following companies help fund Pterodactyl's development. [Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi) -| Company | About | -|--------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Company | About | +| ------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. | | [**CodeNode LLC**](https://codenode.gg/) | Looking for simplicity? Well, look no further! CodeNode has got you covered with everything you need at the rock-bottom price of $1.75 per GB, including dedicated IPs in Dallas, Texas, and Amsterdam, Netherlands. We're not just good, we're the best in the game! | | [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. | diff --git a/wings/1.0/upgrading.md b/wings/1.0/upgrading.md index b5bd9d7c1..c5247c581 100644 --- a/wings/1.0/upgrading.md +++ b/wings/1.0/upgrading.md @@ -9,7 +9,7 @@ is required for it to run. Please see the chart below for how these versions lin most cases your base Wings version should match that of your Panel. | Panel Version | Wings Version | Supported | -|---------------|---------------|-----------| +| ------------- | ------------- | --------- | | 1.0.x | 1.0.x | | | 1.1.x | 1.1.x | | | 1.2.x | 1.2.x | |