Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edits to the documentation #553

Merged
merged 37 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
82ee8d5
Use packages instead of the installer as not supported
PadowYT2 Sep 2, 2023
d5b51d8
Change the branch as the develop branch doesn't have the file
PadowYT2 Sep 3, 2023
3166800
Use "1.0-develop" branch instead of a release version
PadowYT2 Sep 4, 2023
28ab8d3
Add sudo to apt commands
PadowYT2 Sep 27, 2023
995e1a0
Merge branch 'pterodactyl:master' into master
PadowYT2 Oct 17, 2023
c6b8647
Update sponsors
PadowYT2 Oct 17, 2023
7d885a0
Avoid having to update the license each year
PadowYT2 Oct 17, 2023
fb785bb
Actually use a note
PadowYT2 Oct 17, 2023
04af6c4
Remove useless commas
PadowYT2 Oct 17, 2023
f8e5cf2
Remove empty white lines in non SSL configs
PadowYT2 Oct 17, 2023
830d6fc
Remove useless comment as it exists on the Documentation
PadowYT2 Oct 17, 2023
12be1f7
Use 4 spaces instead of 2 for apache configs
PadowYT2 Oct 17, 2023
328aed4
Modify the links in the banner
PadowYT2 Oct 17, 2023
34c5e10
Update getting_started.md
PadowYT2 Oct 22, 2023
b4f0d9d
Merge branch 'master' into master
danny6167 Jul 1, 2024
e2846f1
Add robots noindex tag to all panel 0.7 and daemon 0.6 pages
danny6167 Jul 7, 2024
96fd0dc
Add missing change for noindex
danny6167 Jul 7, 2024
73917cf
Revert "Use packages instead of scripts for installing NodeJS (#542)"
danny6167 Jul 7, 2024
e9744ec
Update PHP versions
danny6167 Jul 7, 2024
91ec18d
Update panels supported OS versions
danny6167 Jul 7, 2024
d9c77aa
Fix some PHP version formatting issues
danny6167 Jul 7, 2024
c304ab6
Revert "Remove useless comment as it exists on the Documentation"
danny6167 Jul 7, 2024
295a7dd
Update to PHP 8.3
danny6167 Jul 7, 2024
9770255
Update some wordings
danny6167 Jul 7, 2024
3b584ac
Specify the php version when installing the apache php module
danny6167 Jul 7, 2024
5069e66
Add some missing comments and correct highlighting in conf blocks
danny6167 Jul 8, 2024
77f91ca
Update wings OS Support table
danny6167 Jul 8, 2024
804fce4
Don't show warning about running composer as root
danny6167 Jul 8, 2024
7bf4332
Remove list and just link to the docker-ce install page
danny6167 Jul 8, 2024
6eaf9c9
Update support table on wings upgrade page
danny6167 Jul 8, 2024
3692541
Update panel upgrade version support and PHP versions
danny6167 Jul 8, 2024
30cbd95
Update php upgrade guide
danny6167 Jul 8, 2024
2cb2ae6
Add sudo to nodejs installation
PadowYT2 Jul 13, 2024
3850dad
Add CentOS forks (i think) to nodejs installation
PadowYT2 Jul 13, 2024
9e3333d
Update tables to match the spacing
PadowYT2 Jul 13, 2024
99667c5
Add sudo to systemctl enable --now wings
LouissXI Oct 14, 2023
4321a62
Format tables
PadowYT2 Aug 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .snippets/webservers/apache-nossl.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<VirtualHost *:80>
ServerName <domain>
DocumentRoot "/var/www/pterodactyl/public"

AllowEncodedSlashes On

php_value upload_max_filesize 100M
php_value post_max_size 100M

<Directory "/var/www/pterodactyl/public">
AllowOverride all
Require all granted
</Directory>
ServerName <domain>
DocumentRoot "/var/www/pterodactyl/public"
AllowEncodedSlashes On
php_value upload_max_filesize 100M
php_value post_max_size 100M
<Directory "/var/www/pterodactyl/public">
AllowOverride all
Require all granted
</Directory>
</VirtualHost>
36 changes: 18 additions & 18 deletions .snippets/webservers/apache.conf
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<VirtualHost *:80>
ServerName <domain>
RewriteEngine On
RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
ServerName <domain>

RewriteEngine On
RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
</VirtualHost>

<VirtualHost *:443>
ServerName <domain>
DocumentRoot "/var/www/pterodactyl/public"
ServerName <domain>
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

<Directory "/var/www/pterodactyl/public">
Require all granted
AllowOverride all
</Directory>
<Directory "/var/www/pterodactyl/public">
Require all granted
AllowOverride all
</Directory>

SSLEngine on
SSLCertificateFile /etc/letsencrypt/live/<domain>/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/<domain>/privkey.pem
SSLEngine on
SSLCertificateFile /etc/letsencrypt/live/<domain>/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/<domain>/privkey.pem
</VirtualHost>
2 changes: 0 additions & 2 deletions .snippets/webservers/nginx-php8.1-nossl.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
server {
# Replace the example <domain> with your domain name or IP address
danny6167 marked this conversation as resolved.
Show resolved Hide resolved
listen 80;
server_name <domain>;


root /var/www/pterodactyl/public;
index index.html index.htm index.php;
charset utf-8;
Expand Down
2 changes: 1 addition & 1 deletion .vuepress/theme/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</a>
</div>
</div>
<div class="footer">MIT Licensed | Pterodactyl&reg; Copyright &copy; 2015 - 2022 Dane Everitt & contributors.</div>
<div class="footer">MIT Licensed | Pterodactyl&reg; Copyright &copy; Dane Everitt and contributors</div>
PadowYT2 marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
</div>
Expand Down
11 changes: 6 additions & 5 deletions .vuepress/theme/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<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 class="text-grey-lightest font-semibold">
Stand with Ukraine 🇺🇦
<a class="text-blue-lighter ml-2" href="https://www.savethechildren.org/us/where-we-work/ukraine" target="_blank" rel="noindex nofollow noopener">Learn</a>
<span class="px-1">&bull;</span>
<a class="text-blue-lighter" href="https://razomforukraine.org/" target="_blank" rel="noindex nofollow noopener">Donate</a>
</div>
</div>
</div>
<div
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
8 changes: 5 additions & 3 deletions panel/1.0/updating.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -136,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 &mdash; 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
Expand Down
24 changes: 12 additions & 12 deletions project/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ 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

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).

Expand Down