Skip to content

Commit 20b84e1

Browse files
lancepiochlancepioch
authored
Merge branch 'main' into main
2 parents db86cc4 + 343732b commit 20b84e1

File tree

10 files changed

+40
-43
lines changed

10 files changed

+40
-43
lines changed

‎docs/comparison.mdx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@ import TabItem from '@theme/TabItem';
88

99
# Comparison
1010

11-
Pelican is a fork of [Pterodactyl](https://pterodactyl.io). But over time Pelican made many Changes & Additions - and we plan to do even more.
11+
Pelican is a fork of [Pterodactyl](https://pterodactyl.io). However, Pelican has many Improvements over it now!
1212

1313
<Admonition type="info">
14-
Want to see these changes in action?
15-
Check out our [Demo](https://demo.pelican.dev)! The Login is `admin`/`admin`.
14+
Want to see these changes in action? Check out our [Demo](https://demo.pelican.dev)!
1615
</Admonition>
1716

1817
<Tabs>
1918
<TabItem value="1" label="General">
20-
* ![Planned](https://img.shields.io/badge/Planned-blue) First party Plugin & Theme system
21-
* ![Planned](https://img.shields.io/badge/Planned-blue) Webhooks for Discord
19+
* ![Planned](https://img.shields.io/badge/Planned-blue) First party Plugins
20+
* ![Planned](https://img.shields.io/badge/Planned-blue) First party Themes
2221
* ![In Progress](https://img.shields.io/badge/In_Progress-orange) Rework allocations
2322
* ![Done](https://img.shields.io/badge/Done-green) Webhooks
2423
* ![Done](https://img.shields.io/badge/Done-green) Roles & Permissions for Admins
25-
* ![Done](https://img.shields.io/badge/Done-green) Removal of Nests & Locations (replaced by Tags)
26-
* ![Done](https://img.shields.io/badge/Done-green) Config option for Binary Prefix (MiB/ GiB)
24+
* ![Done](https://img.shields.io/badge/Done-green) Replace Nests & Locations with Tags
25+
* ![Done](https://img.shields.io/badge/Done-green) Config option for Binary Prefix (MiB/GiB)
2726
* ![Done](https://img.shields.io/badge/Done-green) Improved Settings page
2827
</TabItem>
2928
<TabItem value="2" label="Frontend">
@@ -46,20 +45,19 @@ Pelican is a fork of [Pterodactyl](https://pterodactyl.io). But over time Pelica
4645
* ![Done](https://img.shields.io/badge/Done-green) OAuth
4746
</TabItem>
4847
<TabItem value="5" label="Setup">
49-
* ![In Progress](https://img.shields.io/badge/In_Progress-orange) Dockerized install as preferred install method
48+
* ![In Progress](https://img.shields.io/badge/In_Progress-orange) Official support for PostgreSQL
49+
* ![Done](https://img.shields.io/badge/Done-green) Dockerized Installation
5050
* ![Done](https://img.shields.io/badge/Done-green) Easier Installation process (Web Installer)
5151
* ![Done](https://img.shields.io/badge/Done-green) SQLite as Panel database
5252
* ![Done](https://img.shields.io/badge/Done-green) "Proper" support for MariaDB as Panel database (dedicated driver)
5353
</TabItem>
5454
<TabItem value="6" label="Server">
5555
* ![Planned](https://img.shields.io/badge/Planned-blue) Server sorting
56-
* ![Planned](https://img.shields.io/badge/Planned-blue) Basic Query Information (Hostname & Player Count)
5756
* ![Planned](https://img.shields.io/badge/Planned-blue) IPv6 Support for Allocations
5857
* ![Done](https://img.shields.io/badge/Done-green) Custom docker labels for server containers
5958
* ![Done](https://img.shields.io/badge/Done-green) "Delete files" schedule task
6059
</TabItem>
6160
<TabItem value="7" label="Node">
62-
* ![Planned](https://img.shields.io/badge/Planned-blue) Node Ownership (per Node permissions)
6361
* ![Planned](https://img.shields.io/badge/Planned-blue) More effective wings disk quota enforcement
6462
* ![Done](https://img.shields.io/badge/Done-green) Node resource statistics
6563
* ![Done](https://img.shields.io/badge/Done-green) CPU Limit for Nodes
@@ -76,7 +74,8 @@ Pelican is a fork of [Pterodactyl](https://pterodactyl.io). But over time Pelica
7674
</TabItem>
7775
<TabItem value="9" label="Hub">
7876
* ![Planned](https://img.shields.io/badge/Planned-blue) Marketplace for Eggs
79-
* ![Planned](https://img.shields.io/badge/Planned-blue) Marketplace for Plugins & Themes
77+
* ![Planned](https://img.shields.io/badge/Planned-blue) Marketplace for Plugins
78+
* ![Planned](https://img.shields.io/badge/Planned-blue) Marketplace for Themes
8079
* ![Done](https://img.shields.io/badge/Done-green) Open Finances
8180
* ![Done](https://img.shields.io/badge/Done-green) Support Tickets
8281
</TabItem>

‎docs/guides/php-upgrade.mdx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ table below to check what PHP version you need for your version of Pelican.
1212

1313
| Panel Version | PHP Version |
1414
|---------------|---------------|
15-
| 1.0.0+ | 8.2, 8.3 |
15+
| 1.0.0+ | 8.2, 8.3, 8.4 |
1616

1717
## Install PHP
1818

19-
In order to install PHP 8.3, you will need to run the following commands. Please keep in mind different operating systems
19+
In order to install PHP 8.4, you will need to run the following commands. Please keep in mind different operating systems
2020
may have slightly different requirements for how this commands are formatted.
2121

2222
```bash
@@ -27,22 +27,22 @@ sudo apt -y update
2727
# Optional: Remove old PHP versions
2828
sudo apt -y purge php*
2929

30-
# Install PHP 8.3
31-
sudo apt -y install php8.3 php8.3-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,sqlite3,fpm}
30+
# Install PHP 8.4
31+
sudo apt -y install php8.4 php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,sqlite3,fpm}
3232
```
3333

3434
## Webserver Configuration
3535

3636
<Tabs>
3737
<TabItem value='NGINX'>
38-
After upgrading to PHP 8.3, you will most likely need to update your NGINX configuration. Your configuration file
38+
After upgrading to PHP 8.4, you will most likely need to update your NGINX configuration. Your configuration file
3939
is most likely called `pelican.conf` and located in the `/etc/nginx/sites-available/` directory, or if on CentOS,
4040
`/etc/nginx/conf.d/`.
4141

4242
Make sure to update the path in the command below to reflect the actual location of your configuration file.
4343

4444
``` bash
45-
sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.3-fpm.sock/' /etc/nginx/sites-available/pelican.conf
45+
sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.4-fpm.sock/' /etc/nginx/sites-available/pelican.conf
4646
```
4747

4848
Once you have edited the file run the command below to reload NGINX and apply your changes.
@@ -52,21 +52,21 @@ sudo apt -y install php8.3 php8.3-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,sq
5252
```
5353
</TabItem>
5454
<TabItem value='Apache'>
55-
Run the commands below to disable all previous PHP versions and enable PHP 8.3 when serving requests.
55+
Run the commands below to disable all previous PHP versions and enable PHP 8.4 when serving requests.
5656

5757
``` bash
5858
a2dismod php*
59-
a2enmod php8.3
59+
a2enmod php8.4
6060
```
6161
</TabItem>
6262
<TabItem value='Caddy'>
63-
After upgrading to PHP 8.3, you will most likely need to update your Caddy configuration. Your configuration file
63+
After upgrading to PHP 8.4, you will most likely need to update your Caddy configuration. Your configuration file
6464
is most likely called `Caddyfile` and located in the `/etc/caddy/` directory.
6565

6666
Make sure to update the path in the command below to reflect the actual location of your configuration file.
6767

6868
``` bash
69-
sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.3-fpm.sock/' /etc/caddy/Caddyfile
69+
sed -i -e 's/php[7|8].[0-9]-fpm.sock/php8.4-fpm.sock/' /etc/caddy/Caddyfile
7070
```
7171

7272
Once you have edited the file run the command below to restart Caddy and apply your changes.

‎docs/guides/uninstalling.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Next, remove the Pelican webserver config.
5555
Finally, remove the queue worker service.
5656

5757
```sh
58-
systemctl stop pelican-queue
58+
systemctl disable --now pelican-queue
5959
sudo rm /etc/systemd/system/pelican-queue.service
6060
```
6161

@@ -77,7 +77,7 @@ DROP USER 'pelican'@'127.0.0.1';
7777
To uninstall Wings you just have to remove the wings service, delete the wings binary and delete the wings config file.
7878

7979
```sh
80-
systemctl stop wings
80+
systemctl disable --now wings
8181
sudo rm /etc/systemd/system/wings.service
8282

8383
sudo rm /usr/local/bin/wings

‎docs/panel/getting-started.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Ubuntu 20.04 & Debian 11 do not meet this requirement.
4040

4141
### Dependencies
4242

43-
For the Panel you need to install **PHP `8.3` (recommended) or `8.2`**, with the following **extensions**:
43+
For the Panel you need to install **PHP `8.4` (recommended), `8.3` or `8.2`**, with the following **extensions**:
4444
`gd`, `mysql`, `mbstring`, `bcmath`, `xml`, `curl`, `zip`, `intl`, `sqlite3` and `fpm`.
4545

4646
You will also need a Webserver. Currently, **Apache, NGINX or Caddy** are supported.
@@ -79,7 +79,7 @@ curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/loca
7979
```
8080

8181
```sh
82-
sudo composer install --no-dev --optimize-autoloader
82+
sudo COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader
8383
```
8484

8585
<Admonition type="info">

‎docs/panel/update.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ php artisan down
3232
If you are updating from < 1.0.0-beta13. Please use the below script! This will ensure all the recently deleted files are removed.
3333

3434
Note: this script is experimental... IT WILL NOT CREATE A MYSQL DUMP FOR YOUR DATABASE!
35-
Note Note: This script runs all the below commands for you.
35+
Note: This script runs all the below commands for you.
3636

3737
What the script does, is looks for `.env`, and if it exists pulls `DB_CONNECTION` to see if you are using mysql/mariadb/sqlite, if sqlite it will copy the database.sqlite to a backup folder
3838
along with the env. Once they're copied to the backup folder it will delete everything except the backup folder in the specified install directory.
@@ -67,7 +67,7 @@ sudo chmod -R 755 storage/* bootstrap/cache
6767
### Update Dependencies
6868

6969
```sh
70-
composer install --no-dev --optimize-autoloader
70+
sudo COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader
7171
```
7272

7373
<Admonition type="info">

‎docs/panel/webserver-config.mdx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
1212
<Tabs>
1313
<TabItem value="nginx" label="Nginx">
1414
<Admonition type="warning" title="php & fpm">
15-
If you're **not** using php8.3, you will need to edit the config file to point to the proper php fpm socket.
15+
If you're **not** using php8.4, you will need to edit the config file to point to the proper php fpm socket.
1616

1717
The line is highlighted below.
1818
</Admonition>
@@ -75,7 +75,7 @@ import TabItem from '@theme/TabItem';
7575
7676
location ~ \.php$ {
7777
fastcgi_split_path_info ^(.+\.php)(/.+)$;
78-
fastcgi_pass unix:/run/php/php8.3-fpm.sock;
78+
fastcgi_pass unix:/run/php/php8.4-fpm.sock;
7979
fastcgi_index index.php;
8080
include fastcgi_params;
8181
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
@@ -125,7 +125,7 @@ import TabItem from '@theme/TabItem';
125125
126126
location ~ \.php$ {
127127
fastcgi_split_path_info ^(.+\.php)(/.+)$;
128-
fastcgi_pass unix:/run/php/php8.3-fpm.sock;
128+
fastcgi_pass unix:/run/php/php8.4-fpm.sock;
129129
fastcgi_index index.php;
130130
include fastcgi_params;
131131
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
@@ -230,15 +230,15 @@ import TabItem from '@theme/TabItem';
230230
Once you've created the file above, simply run the commands below.
231231

232232
<Admonition type="warning" title="php & fpm">
233-
If you're **not** using php8.3, you will need to edit the command to point to enable the correct mod.
233+
If you're **not** using php8.4, you will need to edit the command to point to enable the correct mod.
234234

235235
The line is highlighted below.
236236
</Admonition>
237237

238238
```sh {3}
239239
sudo a2ensite pelican.conf
240240
sudo a2enmod rewrite
241-
sudo a2enmod php8.3
241+
sudo a2enmod php8.4
242242
```
243243

244244
#### You need to restart apache to load the new config file.
@@ -250,7 +250,7 @@ import TabItem from '@theme/TabItem';
250250
</TabItem>
251251
<TabItem value="caddy" label="Caddy">
252252
<Admonition type="warning" title="php & fpm">
253-
If you're **not** using php8.3, you will need to edit the config file to point to the proper php fpm socket.
253+
If you're **not** using php8.4, you will need to edit the config file to point to the proper php fpm socket.
254254

255255
The line is highlighted below.
256256
</Admonition>
@@ -281,7 +281,7 @@ import TabItem from '@theme/TabItem';
281281

282282
file_server
283283

284-
php_fastcgi unix//run/php/php8.3-fpm.sock {
284+
php_fastcgi unix//run/php/php8.4-fpm.sock {
285285
root /var/www/pelican/public
286286
index index.php
287287

@@ -320,7 +320,7 @@ import TabItem from '@theme/TabItem';
320320
```
321321
</TabItem>
322322
<TabItem value="fhttp" label="http">
323-
```caddy {9.14} title="/etc/caddy/Caddyfile"
323+
```caddy {9,14} title="/etc/caddy/Caddyfile"
324324
{
325325
servers :80 {
326326
timeouts {
@@ -334,7 +334,7 @@ import TabItem from '@theme/TabItem';
334334

335335
file_server
336336

337-
php_fastcgi unix//run/php/php8.3-fpm.sock {
337+
php_fastcgi unix//run/php/php8.4-fpm.sock {
338338
root /var/www/pelican/public
339339
index index.php
340340

‎docs/wings/install.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ sudo chmod u+x /usr/local/bin/wings
109109
Once you have installed Wings and the required components, the next step is to create a node on your installed Panel.
110110
Go to your Panel administrative view, select Nodes from the sidebar, and on the right side click Create New button.
111111

112-
After you have created a node, click on it and there will be a tab called Configuration.
113-
Copy the code block content, paste it into a new file called `config.yml` in `/etc/pelican` and save it.
112+
After you have created a node, click on it and there will be a tab called Configuration.
113+
Copy the code block content, create a new file at `/etc/pelican/config.yml`, paste the content into it and save.
114114

115-
Alternatively, you can click on the Generate Token button, copy the sh command and paste it into your terminal.
115+
Alternatively, you can click on the Auto Deploy Command button, copy the sh command and paste it into your terminal.
116116

117117
<Admonition type="warning" title="Using ssl?">
118118
If your Panel is using SSL, then Wings must also use SSL.

‎docs/wings/update.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ Secondly, Restart the process.
4343
```sh
4444
sudo systemctl restart wings
4545
```
46-
47-
Eazy as 1..2.. Oh it's done...

‎src/components/HomepageFeatures/why.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const FeatureList: FeatureItem[] = [
4242
<Link to={'https://www.valheimgame.com'}>Valheim</Link><>, </>
4343
<Link to={'https://enshrouded.com'}>Enshrouded</Link><>, </>
4444
<Link to={'https://factorio.com'}>Factorio</Link><>, </>
45-
<Link to={'/eggs-nest'} target={'_blank'}>and so much more</Link>.
45+
<Link to={'/eggs'} target={'_blank'}>and so much more</Link>.
4646
Check our eggs out, we like them scrambled!
4747
</>
4848
),

‎src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function HomepageHeader() {
3030
<Link
3131
style={{ fontSize: '26px', margin: '15px' }}
3232
className="button button--secondary button--md"
33-
to="/docs/comparison#pterodactyl"
33+
to="https://demo.pelican.dev"
3434
>Demo</Link>
3535
</div>
3636
</div>

0 commit comments

Comments
 (0)