Merge branch 'pterodactyl:master' into master

.snippets/webservers/Caddyfile

@@ -0,0 +1,49 @@
+{
+    servers :443 {
+        timeouts {
+            read_body 120s
+        }
+    }
+}
+
+<domain> {
+    root * /var/www/pterodactyl/public
+
+    file_server
+
+    php_fastcgi unix//run/php/php8.1-fpm.sock {
+        root /var/www/pterodactyl/public
+        index index.php
+
+        env PHP_VALUE "upload_max_filesize = 100M
+        post_max_size = 100M"
+        env HTTP_PROXY ""
+        env HTTPS "on"
+
+        read_timeout 300s
+        dial_timeout 300s
+        write_timeout 300s
+    }
+
+    header Strict-Transport-Security "max-age=16768000; preload;"
+    header X-Content-Type-Options "nosniff"
+    header X-XSS-Protection "1; mode=block;"
+    header X-Robots-Tag "none"
+    header Content-Security-Policy "frame-ancestors 'self'"
+    header X-Frame-Options "DENY"
+    header Referrer-Policy "same-origin"
+
+    request_body {
+        max_size 100m
+    }
+
+    respond /.ht* 403
+
+    log {
+        output file /var/log/caddy/pterodactyl.log {
+            roll_size 100MiB
+            roll_keep_for 7d
+        }
+        level INFO
+    }
+}

.snippets/webservers/Caddyfile-nossl

@@ -0,0 +1,49 @@
+{
+    servers :80 {
+        timeouts {
+            read_body 120s
+        }
+    }
+}
+
+<domain>:80 {
+    root * /var/www/pterodactyl/public
+
+    file_server
+
+    php_fastcgi unix//run/php/php8.1-fpm.sock {
+        root /var/www/pterodactyl/public
+        index index.php
+
+        env PHP_VALUE "upload_max_filesize = 100M
+        post_max_size = 100M"
+        env HTTP_PROXY ""
+        # env HTTPS "on" # IMPORTANT: this is commented out, to disable HTTPS
+
+        read_timeout 300s
+        dial_timeout 300s
+        write_timeout 300s
+    }
+
+    header Strict-Transport-Security "max-age=16768000; preload;"
+    header X-Content-Type-Options "nosniff"
+    header X-XSS-Protection "1; mode=block;"
+    header X-Robots-Tag "none"
+    header Content-Security-Policy "frame-ancestors 'self'"
+    header X-Frame-Options "DENY"
+    header Referrer-Policy "same-origin"
+
+    request_body {
+        max_size 100m
+    }
+
+    respond /.ht* 403
+
+    log {
+        output file /var/log/caddy/pterodactyl.log {
+            roll_size 100MiB
+            roll_keep_for 7d
+        }
+        level INFO
+    }
+}

.vuepress/config.js

@@ -74,8 +74,7 @@ module.exports = {
                     children: [
                         '/community/installation-guides/panel/centos7.md',
                         '/community/installation-guides/panel/centos8.md',
-                        '/community/installation-guides/panel/debian10.md',
-                        '/community/installation-guides/panel/debian11.md',
+                        '/community/installation-guides/panel/debian.md',
                     ]
                 },
                 {
@@ -84,8 +83,7 @@ module.exports = {
                     children: [
                         '/community/installation-guides/wings/centos7.md',
                         '/community/installation-guides/wings/centos8.md',
-                        '/community/installation-guides/wings/debian10.md',
-                        '/community/installation-guides/wings/debian11.md',
+                        '/community/installation-guides/wings/debian.md',
                     ]
                 },
                 {

.vuepress/theme/Layout.vue

@@ -1,16 +1,7 @@
 <template>
   <div>
-    <div class="fixed h-12 w-full z-50 top-0">
-      <div class="h-12 w-full bg-black flex items-center justify-center px-4">
-        <p class="text-grey-lightest font-semibold">
-          Stand with Ukraine 🇺🇦&nbsp;
-          <a class="text-blue-lighter" href="https://www.savethechildren.org/us/where-we-work/ukraine" target="_blank" rel="noindex nofollow noopener">Donate</a>
-          <a class="text-blue-lighter" href="https://razomforukraine.org/" target="_blank" rel="noindex nofollow noopener">Today.</a>
-        </p>
-      </div>
-    </div>
     <div
-        class="theme-container mt-12"
+        class="theme-container"
         :class="pageClasses"
         @touchstart="onTouchStart"
         @touchend="onTouchEnd"

.vuepress/theme/styles/sidebar.css

@@ -6,7 +6,7 @@ $arrow-bg: #000;
     }
 
     @apply .fixed .left-0 .bottom-0 .bg-white .overflow-auto .border-r .border-grey-lighter .py-8;
-    top: calc(3rem + 56px);
+    top: 56px;
     width: 20rem;
     font-size: 15px;
 

community/config/eggs/creating_a_custom_egg.md

@@ -6,8 +6,8 @@ changes to these, and you'll lose any changes you've made.
 
 [[toc]]
 
-The first thing you'll need to do is create a new service. In this case, the name and description speak for themselves
-in this case. The `Folder Name` _must be a unique name_ not being used by any other service, and should only
+The first thing you'll need to do is create a new service. In this case, the name and description speak for themselves.
+The `Folder Name` _must be a unique name_ not being used by any other service, and should only
 contain letters, numbers, underscores, and dashes. This is the name of the folder where the daemon will be storing
 the service options on the daemon.
 

community/config/nodes/add_node.md

@@ -45,7 +45,7 @@ Don't forget to account for OS overhead and other software requirements on machi
 ## Install the Daemon
 At this point you'll need to have the Daemon installed on your machine. Check out the [documentation](/wings/installing.html)
 for more information, or try one of the community guides for [CentOS](/community/installation-guides/wings/centos7.html),
-[Ubuntu](/community/installation-guides/wings/ubuntu1804.html), or [Debian](/community/installation-guides/wings/debian9.html).
+or [Debian](/community/installation-guides/wings/debian.html).
 
 ## Configuring the Node
 Go to the Node Configuration page

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/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.
@@ -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 -
-apt install -y nodejs
+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
 
 # 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.

community/installation-guides/panel/centos8.md

@@ -1,4 +1,4 @@
-# CentOS 8, Rocky Linux 8, AlmaLinux 8
+# CentOS 8, Rocky Linux 8, AlmaLinux 8, Fedora Server 38
 In this guide we will install Pterodactyl v1.X — including all of it's dependencies — and configure our webserver to serve it using SSL.
 
 [[toc]]
@@ -29,7 +29,7 @@ systemctl enable mariadb
 ```
 
 ### PHP 8.0
-We recommend the remi repo to get the latest php packages.
+We recommend the remi repo to get the latest php packages. (Skip to next section if on Fedora 38)
 
 ```bash
 ## Install Repos
@@ -44,6 +44,13 @@ dnf update -y
 dnf install -y php php-{common,fpm,cli,json,mysqlnd,gd,mbstring,pdo,zip,bcmath,dom,opcache}
 ```
 
+### If using Fedora Server 38 install PHP 8.1 and Dependencies from this section. If not, skip this section.
+```bash
+dnf install https://rpms.remirepo.net/fedora/remi-release-38.rpm
+dnf module enable php:remi-8.1
+dnf install php php-{common,fpm,cli,json,mysqlnd,gd,mbstring,pdo,zip,bcmath,dom,opcache,process}
+```
+
 ### Composer
 ```bash
 dnf install -y zip unzip tar # Required for Composer

community/installation-guides/panel/debian11.md → community/installation-guides/panel/debian.md

@@ -1,9 +1,9 @@
-# Debian 11
+# Debian 11 & 12
 
 [[toc]]
 
 ::: tip
-This guide is based off the [official installation documentation](/panel/1.0/getting_started.md) but is tailored specifically for Debian 11.
+This guide is based off the [official installation documentation](/panel/1.0/getting_started.md) but is tailored specifically for Debian 11 and 12.
 :::
 
 ## Dependency Installation
@@ -20,7 +20,7 @@ apt -y install software-properties-common curl ca-certificates gnupg2 sudo lsb-r
 # Add repository for PHP
 echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list
 
-curl -fsSL  https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/sury-keyring.gpg
+curl -fsSL https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/sury-keyring.gpg
 
 # Add repository for Redis
 curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg