Skip to content

Commit 6b1ce13

Browse files
JcodeerdJcodeerd
authored
Merge branch 'pterodactyl:master' into master
2 parents a229982 + e216789 commit 6b1ce13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+428
-507
lines changed

‎.snippets/webservers/Caddyfile

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
servers :443 {
3+
timeouts {
4+
read_body 120s
5+
}
6+
}
7+
}
8+
9+
<domain> {
10+
root * /var/www/pterodactyl/public
11+
12+
file_server
13+
14+
php_fastcgi unix//run/php/php8.1-fpm.sock {
15+
root /var/www/pterodactyl/public
16+
index index.php
17+
18+
env PHP_VALUE "upload_max_filesize = 100M
19+
post_max_size = 100M"
20+
env HTTP_PROXY ""
21+
env HTTPS "on"
22+
23+
read_timeout 300s
24+
dial_timeout 300s
25+
write_timeout 300s
26+
}
27+
28+
header Strict-Transport-Security "max-age=16768000; preload;"
29+
header X-Content-Type-Options "nosniff"
30+
header X-XSS-Protection "1; mode=block;"
31+
header X-Robots-Tag "none"
32+
header Content-Security-Policy "frame-ancestors 'self'"
33+
header X-Frame-Options "DENY"
34+
header Referrer-Policy "same-origin"
35+
36+
request_body {
37+
max_size 100m
38+
}
39+
40+
respond /.ht* 403
41+
42+
log {
43+
output file /var/log/caddy/pterodactyl.log {
44+
roll_size 100MiB
45+
roll_keep_for 7d
46+
}
47+
level INFO
48+
}
49+
}

‎.snippets/webservers/Caddyfile-nossl

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
servers :80 {
3+
timeouts {
4+
read_body 120s
5+
}
6+
}
7+
}
8+
9+
<domain>:80 {
10+
root * /var/www/pterodactyl/public
11+
12+
file_server
13+
14+
php_fastcgi unix//run/php/php8.1-fpm.sock {
15+
root /var/www/pterodactyl/public
16+
index index.php
17+
18+
env PHP_VALUE "upload_max_filesize = 100M
19+
post_max_size = 100M"
20+
env HTTP_PROXY ""
21+
# env HTTPS "on" # IMPORTANT: this is commented out, to disable HTTPS
22+
23+
read_timeout 300s
24+
dial_timeout 300s
25+
write_timeout 300s
26+
}
27+
28+
header Strict-Transport-Security "max-age=16768000; preload;"
29+
header X-Content-Type-Options "nosniff"
30+
header X-XSS-Protection "1; mode=block;"
31+
header X-Robots-Tag "none"
32+
header Content-Security-Policy "frame-ancestors 'self'"
33+
header X-Frame-Options "DENY"
34+
header Referrer-Policy "same-origin"
35+
36+
request_body {
37+
max_size 100m
38+
}
39+
40+
respond /.ht* 403
41+
42+
log {
43+
output file /var/log/caddy/pterodactyl.log {
44+
roll_size 100MiB
45+
roll_keep_for 7d
46+
}
47+
level INFO
48+
}
49+
}

‎.vuepress/config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ module.exports = {
7474
children: [
7575
'/community/installation-guides/panel/centos7.md',
7676
'/community/installation-guides/panel/centos8.md',
77-
'/community/installation-guides/panel/debian10.md',
78-
'/community/installation-guides/panel/debian11.md',
77+
'/community/installation-guides/panel/debian.md',
7978
]
8079
},
8180
{
@@ -84,8 +83,7 @@ module.exports = {
8483
children: [
8584
'/community/installation-guides/wings/centos7.md',
8685
'/community/installation-guides/wings/centos8.md',
87-
'/community/installation-guides/wings/debian10.md',
88-
'/community/installation-guides/wings/debian11.md',
86+
'/community/installation-guides/wings/debian.md',
8987
]
9088
},
9189
{

‎.vuepress/theme/Layout.vue

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
<template>
22
<div>
3-
<div class="fixed h-12 w-full z-50 top-0">
4-
<div class="h-12 w-full bg-black flex items-center justify-center px-4">
5-
<p class="text-grey-lightest font-semibold">
6-
Stand with Ukraine 🇺🇦&nbsp;
7-
<a class="text-blue-lighter" href="https://www.savethechildren.org/us/where-we-work/ukraine" target="_blank" rel="noindex nofollow noopener">Donate</a>
8-
<a class="text-blue-lighter" href="https://razomforukraine.org/" target="_blank" rel="noindex nofollow noopener">Today.</a>
9-
</p>
10-
</div>
11-
</div>
123
<div
13-
class="theme-container mt-12"
4+
class="theme-container"
145
:class="pageClasses"
156
@touchstart="onTouchStart"
167
@touchend="onTouchEnd"

‎.vuepress/theme/styles/sidebar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $arrow-bg: #000;
66
}
77

88
@apply .fixed .left-0 .bottom-0 .bg-white .overflow-auto .border-r .border-grey-lighter .py-8;
9-
top: calc(3rem + 56px);
9+
top: 56px;
1010
width: 20rem;
1111
font-size: 15px;
1212

‎community/config/eggs/creating_a_custom_egg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ changes to these, and you'll lose any changes you've made.
66

77
[[toc]]
88

9-
The first thing you'll need to do is create a new service. In this case, the name and description speak for themselves
10-
in this case. The `Folder Name` _must be a unique name_ not being used by any other service, and should only
9+
The first thing you'll need to do is create a new service. In this case, the name and description speak for themselves.
10+
The `Folder Name` _must be a unique name_ not being used by any other service, and should only
1111
contain letters, numbers, underscores, and dashes. This is the name of the folder where the daemon will be storing
1212
the service options on the daemon.
1313

‎community/config/nodes/add_node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Don't forget to account for OS overhead and other software requirements on machi
4545
## Install the Daemon
4646
At this point you'll need to have the Daemon installed on your machine. Check out the [documentation](/wings/installing.html)
4747
for more information, or try one of the community guides for [CentOS](/community/installation-guides/wings/centos7.html),
48-
[Ubuntu](/community/installation-guides/wings/ubuntu1804.html), or [Debian](/community/installation-guides/wings/debian9.html).
48+
or [Debian](/community/installation-guides/wings/debian.html).
4949

5050
## Configuring the Node
5151
Go to the Node Configuration page

‎community/customization/panel.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Do **not** run the following steps on your production nodes.
55
:::
66

7-
Instructions on how to build the panel are also available in the [BUILDING.md](https://github.com/pterodactyl/panel/blob/develop/BUILDING.md) file.
7+
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.
88

99
The frontend of the Panel is built with React. Any changes to the source files require to recompile it.
1010
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.
1717

1818
```bash
1919
# Ubuntu/Debian
20-
curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
21-
apt install -y nodejs
20+
sudo mkdir -p /etc/apt/keyrings
21+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
22+
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
23+
24+
sudo apt update
25+
sudo apt install -y nodejs
2226

2327
# CentOS
24-
curl -sL https://rpm.nodesource.com/setup_16.x | sudo -E bash -
25-
sudo yum install -y nodejs yarn # CentOS 7
26-
sudo dnf install -y nodejs yarn # CentOS 8
28+
sudo yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y
29+
sudo yum install nodejs -y
2730
```
2831

2932
Install required javascript packages.

‎community/installation-guides/panel/centos8.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CentOS 8, Rocky Linux 8, AlmaLinux 8
1+
# CentOS 8, Rocky Linux 8, AlmaLinux 8, Fedora Server 38
22
In this guide we will install Pterodactyl v1.X — including all of it's dependencies — and configure our webserver to serve it using SSL.
33

44
[[toc]]
@@ -29,7 +29,7 @@ systemctl enable mariadb
2929
```
3030

3131
### PHP 8.0
32-
We recommend the remi repo to get the latest php packages.
32+
We recommend the remi repo to get the latest php packages. (Skip to next section if on Fedora 38)
3333

3434
```bash
3535
## Install Repos
@@ -44,6 +44,13 @@ dnf update -y
4444
dnf install -y php php-{common,fpm,cli,json,mysqlnd,gd,mbstring,pdo,zip,bcmath,dom,opcache}
4545
```
4646

47+
### If using Fedora Server 38 install PHP 8.1 and Dependencies from this section. If not, skip this section.
48+
```bash
49+
dnf install https://rpms.remirepo.net/fedora/remi-release-38.rpm
50+
dnf module enable php:remi-8.1
51+
dnf install php php-{common,fpm,cli,json,mysqlnd,gd,mbstring,pdo,zip,bcmath,dom,opcache,process}
52+
```
53+
4754
### Composer
4855
```bash
4956
dnf install -y zip unzip tar # Required for Composer

‎community/installation-guides/panel/debian11.md renamed to ‎community/installation-guides/panel/debian.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Debian 11
1+
# Debian 11 & 12
22

33
[[toc]]
44

55
::: tip
6-
This guide is based off the [official installation documentation](/panel/1.0/getting_started.md) but is tailored specifically for Debian 11.
6+
This guide is based off the [official installation documentation](/panel/1.0/getting_started.md) but is tailored specifically for Debian 11 and 12.
77
:::
88

99
## Dependency Installation
@@ -20,7 +20,7 @@ apt -y install software-properties-common curl ca-certificates gnupg2 sudo lsb-r
2020
# Add repository for PHP
2121
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list
2222

23-
curl -fsSL https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/sury-keyring.gpg
23+
curl -fsSL https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/sury-keyring.gpg
2424

2525
# Add repository for Redis
2626
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg

0 commit comments

Comments
 (0)