From 19955f55b7eb8139e44d7299115183e1ba60a89c Mon Sep 17 00:00:00 2001 From: ckykenken <26035978+ckykenken@users.noreply.github.com> Date: Wed, 16 Jan 2019 13:38:16 +0800 Subject: [PATCH 01/28] Added documentation for acme.sh --- tutorials/creating_ssl_certificates.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tutorials/creating_ssl_certificates.md b/tutorials/creating_ssl_certificates.md index d6aa4cdd..28d087dd 100644 --- a/tutorials/creating_ssl_certificates.md +++ b/tutorials/creating_ssl_certificates.md @@ -1,6 +1,8 @@ # Creating SSL Certificates -This tutorial briefly covers creating new SSL certificates for your panel and daemon using LetsEncrypt™. To -begin, we will be installing certbot, a simple script that will automatically renew our certificates and allow much +This tutorial briefly covers creating new SSL certificates for your panel and daemon using LetsEncrypt™. + +## Method 1: Using Certbot +To begin, we will be installing certbot, a simple script that will automatically renew our certificates and allow much cleaner creation of them. The command below is for Ubuntu distributions, but you can always check [Certbot's official site](https://certbot.eff.org/) for installation instructions. @@ -10,7 +12,7 @@ sudo apt update sudo apt install certbot ``` -## Creating a Certificate +### Creating a Certificate After installing certbot, we need to then generate a certificate. There are a couple ways to do that, but the easiest is to have letsencrypt spin-up a temporary web-server to do this. In order for this to work, you will first need to stop NGINX or Apache. @@ -26,10 +28,10 @@ that you've already configured the webservers to use SSL). certbot certonly -d example.com ``` -## Auto Renewal +### Auto Renewal You'll also probably want to configure automatic renewal by adding the command below to a cronjob that runs daily. You can add the command below to that crontab. For advanced users, we suggest installing and using [acme.sh](https://acme.sh) -which provides more options, and is much more powerful than certbot. +which provides more options (see below), and is much more powerful than certbot. ``` text certbot renew From 8bcd067cb53bb67444d3935fbc76f0ac3491a2ac Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 4 Feb 2019 15:39:26 -0500 Subject: [PATCH 02/28] Create new community tutorials section Import #61 from the core docs moving them to a community tutorial section. --- .vuepress/config.js | 7 +++ .../tutorials/creating_ssl_certificates.md | 43 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 community/tutorials/creating_ssl_certificates.md diff --git a/.vuepress/config.js b/.vuepress/config.js index 9788a3b5..610f47d8 100644 --- a/.vuepress/config.js +++ b/.vuepress/config.js @@ -90,6 +90,13 @@ module.exports = { '/community/games/minecraft.md', ], }, + { + title: 'Tutorials', + collapsable: false, + children: [ + '/community/tutorials/creating_ssl_certificates.md', + ], + }, ], '/': [ { diff --git a/community/tutorials/creating_ssl_certificates.md b/community/tutorials/creating_ssl_certificates.md new file mode 100644 index 00000000..80bff960 --- /dev/null +++ b/community/tutorials/creating_ssl_certificates.md @@ -0,0 +1,43 @@ +# Creating SSL Certificates +These are community manages tutorials on how to generate an ssl cert. + + +## Cloudflare +This tutorial briefly covers creating new SSL certificates for your panel and daemon using Cloudflare + +### Using acme.sh +This is for advanced users, of which their server systems do not have access to port 80. The command below is for Ubuntu distributions and CloudFlare API (you may google for other APIs for other DNS providers), but you can always check [acme.sh's official site](https://github.com/Neilpang/acme.sh) for installation instructions. + +``` bash +curl https://get.acme.sh | sh +``` + +### Obtaining CloudFlare API Key +After installing acme.sh, we need to fetch a CloudFlare API key. Please make sure that a DNS record (A or CNAME record) is pointing to your target node, and set the cloud to grey (bypassing CloudFlare proxy). Then go to My Profile > API keys and on Glocal API Key subtab, click on "view", enter your CloudFlare password, and copy the API key to clipboard. + +### Creating a Certificate +Since the configuration file is based on Certbot, we need to create the folder manually. + +```bash +sudo mkdir /etc/letsencrypt/live/example.com +``` + +After installing certbot and obtaining CloudFlare API key, we need to then generate a certificate. First input the CloudFlare API credentials. + +```bash +export CF_Key="Your_CloudFlare_API_Key" +export CF_Email="Your_CloudFlare_Account@example.com" +``` +Then create the certificate. + +```bash +acme.sh --issue --standalone -d "example.com" --dns dns_cf \ +--key-file /etc/letsencrypt/live/example.com/privkey.pem \ +--fullchain-file /etc/letsencrypt/live/example.com/fullchain.pem +``` +### Auto Renewal +After running the script for the first time, it will be added to the crontab automatically. You may edit the auto renewal interval by editing the crontab. + +```bash +sudo crontab -e +``` \ No newline at end of file From 6203625d5e3ff46261a884ca3bb871efac825b00 Mon Sep 17 00:00:00 2001 From: Vilhelm Prytz Date: Tue, 5 Mar 2019 22:25:27 +0100 Subject: [PATCH 03/28] Update to 0.7.13 --- panel/upgrading.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/upgrading.md b/panel/upgrading.md index 529c09ff..0b0f627e 100644 --- a/panel/upgrading.md +++ b/panel/upgrading.md @@ -24,6 +24,6 @@ php artisan queue:restart ## Version Specific Guides -* [0.6.X to 0.7.12](/panel/upgrade/0.6_to_0.7.md) +* [0.6.X to 0.7.13](/panel/upgrade/0.6_to_0.7.md) * [0.7.X series](/panel/upgrade/0.7.md) From 2e516e1bf2ed5cc3ba4a8db95c5f8df6f581ef07 Mon Sep 17 00:00:00 2001 From: Glare Masters Date: Wed, 6 Mar 2019 22:57:04 -0600 Subject: [PATCH 04/28] Start redis server on boot Unless I missed it, I did not see any documentation on telling the user to enable this server. Typically if someone doesn't know they should do this, then they most likely won't. Failing to run this command has caused a lot of unneeded issues due to the panel not being able to fetch the eggs since the redis-server isn't running. --- panel/getting_started.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/panel/getting_started.md b/panel/getting_started.md index 22338e98..fa058248 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -211,6 +211,13 @@ If you are not using `redis` for anything you should remove the `After=` line, o when the service starts. ::: +::: +If you are are using redis for your system, you will want to make sure to enable that it will start on boot. You can do that by running the following command: +```bash +sudo systemctl enable redis-server +``` +::: + Finally, enable the service and set it to boot on machine start. ``` bash From 642e85541bcd398f236adc03e8046be7012b605d Mon Sep 17 00:00:00 2001 From: Michael <28601081+clrxbl@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:09:44 +0100 Subject: [PATCH 05/28] Add python-dev packages mmmagic fails to build without python-dev installed on Debian 9. It's not installed by default on OVH atleast. --- daemon/installing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/installing.md b/daemon/installing.md index c4134a6a..e99a09aa 100644 --- a/daemon/installing.md +++ b/daemon/installing.md @@ -51,7 +51,7 @@ Pterodactyl's Daemon requires the following dependencies be installed on your sy * `tar` * `unzip` * `make`, `gcc` (`gcc-c++` on CentOS), `g++` -* `python` +* `python`, `python-dev` ### Installing Docker For a quick install of Docker CE, you can execute the command below: @@ -100,7 +100,7 @@ NodeJS is also super easy to install! Simply run the command below to make the p ``` bash curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - -apt -y install nodejs make gcc g++ +apt -y install nodejs make gcc g++ python-dev ``` ::: tip Other OS Distributions From 837badf8db206a4e5020f622b4960b9acaf6b502 Mon Sep 17 00:00:00 2001 From: Glare Masters Date: Sat, 23 Mar 2019 03:18:07 -0500 Subject: [PATCH 06/28] Clarify something for Apache It seems to be a weekly issue that for people with Apache, they have issues installing the panel because they follow the tutorial and then when they view it, it's displaying the actual PHP code. The notice I've inserted will help make users aware that when using Apache, they need to specific package for Apache that will make PHP run properly. --- panel/webserver_configuration.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/panel/webserver_configuration.md b/panel/webserver_configuration.md index eda12014..1ed83cb0 100644 --- a/panel/webserver_configuration.md +++ b/panel/webserver_configuration.md @@ -38,6 +38,8 @@ systemctl restart nginx You should paste the contents of the file below, replacing `` with your domain name being used in a file called `pterodactyl.conf` and place it in `/etc/apache2/sites-available`, or — if on CentOS, `/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. + ### Apache With SSL Like the nginx configuration, this assumes you will be using SSL on both the Panel and Daemons for improved security. You will need to visit our [Creating SSL Certificates](/tutorials/creating_ssl_certificates.html) documentation page on how to create these certificates. From 991e6a06c61f56c4e77a549e78b0931c03db1522 Mon Sep 17 00:00:00 2001 From: Glare Masters Date: Sat, 23 Mar 2019 03:21:55 -0500 Subject: [PATCH 07/28] Typo Fixed I fixed a typo I had on my last PR and this commit will fix it! --- panel/getting_started.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/panel/getting_started.md b/panel/getting_started.md index fa058248..a345f1a6 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -211,12 +211,10 @@ If you are not using `redis` for anything you should remove the `After=` line, o when the service starts. ::: -::: If you are are using redis for your system, you will want to make sure to enable that it will start on boot. You can do that by running the following command: ```bash sudo systemctl enable redis-server ``` -::: Finally, enable the service and set it to boot on machine start. From 5347910167a545fa8f3a7944c7874d6974e38cfc Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Wed, 27 Mar 2019 02:20:59 -0400 Subject: [PATCH 08/28] Remove `or higher` from mysql Mysql version 8.x isn't supported so `or higher` shouldn't be there, as it implies MySQL 8 is supported. --- panel/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/getting_started.md b/panel/getting_started.md index a345f1a6..f16d8547 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -30,7 +30,7 @@ this software on an OpenVZ based system you will — most likely — not ## Dependencies * PHP `7.2` with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip` -* MySQL `5.7` or higher **or** MariaDB `10.1.3` or higher +* MySQL `5.7`**or** MariaDB `10.1.3` or higher * Redis (`redis-server`) * A webserver (Apache, NGINX, Caddy, etc.) * `curl` From 61729240cd87e825283d5d76608e35896bc6d740 Mon Sep 17 00:00:00 2001 From: Thien Tran <42406302+Ethereal739@users.noreply.github.com> Date: Fri, 29 Mar 2019 23:15:35 -0400 Subject: [PATCH 09/28] Update installing.md --- daemon/installing.md | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/installing.md b/daemon/installing.md index c4134a6a..23f5e855 100644 --- a/daemon/installing.md +++ b/daemon/installing.md @@ -14,6 +14,7 @@ | | 9 | :white_check_mark: | | | **Alpine Linux** | 3.4+ | :warning: | Not officially supported, but reportedly works. | | **RHEL** | 7 | :warning: | Not officially supported, should work. | +| **Fedora** | 29 | :warning: | Not officially supported, should work. | | **Fedora** | 28 | :warning: | Not officially supported, should work. | ## System Requirements From d8a7c579d3509ba3af2652ee074fc523c17998c9 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 21 Apr 2019 17:52:33 -0400 Subject: [PATCH 10/28] Add user creation header Add a header for creating a user to the docs. Make it easier to find. --- panel/getting_started.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/panel/getting_started.md b/panel/getting_started.md index f16d8547..b56e0c07 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -137,6 +137,8 @@ command will setup the database tables and then add all of the Nests & Eggs that php artisan migrate --seed ``` + +### Create Your First User You'll then need to create an administrative user so that you can log into the panel. To do so, run the command below. At this time passwords **must** meet the following requirements: 8 characters, mixed case, at least one number. From 6338f139f791fd65e2230d5bb998daa3618e6edc Mon Sep 17 00:00:00 2001 From: blastehh Date: Sat, 27 Apr 2019 12:34:22 +0100 Subject: [PATCH 11/28] Spelling error --- daemon/standalone_sftp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/standalone_sftp.md b/daemon/standalone_sftp.md index 0a5e7e84..cd115a53 100644 --- a/daemon/standalone_sftp.md +++ b/daemon/standalone_sftp.md @@ -4,7 +4,7 @@ Standalone SFTP support was introduced in `Panel@v0.7.11` and `Daemon@v0.6.8` and will not work with prior versions. ::: -Pterodactyl now ships with the option to use a [standlone SFTP server](https://github.com/pterodactyl/sftp-server) +Pterodactyl now ships with the option to use a [standalone SFTP server](https://github.com/pterodactyl/sftp-server) rather than using the one that was built into the Daemon. This provides better compatability with SFTP clients, improved transfer speeds, and a more native approach to file handling and server operation. From ec934eff6f31a989fb9531e6262ca88e0e4be4f3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 6 May 2019 08:57:45 -0400 Subject: [PATCH 12/28] add header for adding a user People miss it all the time. --- panel/getting_started.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/panel/getting_started.md b/panel/getting_started.md index f16d8547..495127eb 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -137,6 +137,8 @@ command will setup the database tables and then add all of the Nests & Eggs that php artisan migrate --seed ``` + +### Add The First User You'll then need to create an administrative user so that you can log into the panel. To do so, run the command below. At this time passwords **must** meet the following requirements: 8 characters, mixed case, at least one number. From da803e279e12b41ad44dd364fdfe64f0151cf0d1 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 6 May 2019 09:02:09 -0400 Subject: [PATCH 13/28] Add header for adding a user People keep missing this --- panel/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/getting_started.md b/panel/getting_started.md index f16d8547..900920f0 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -136,7 +136,7 @@ command will setup the database tables and then add all of the Nests & Eggs that ``` bash php artisan migrate --seed ``` - +### Add The First User You'll then need to create an administrative user so that you can log into the panel. To do so, run the command below. At this time passwords **must** meet the following requirements: 8 characters, mixed case, at least one number. From 58f6930776fbbd5ffc0295ec8f20390de47aa704 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Sun, 12 May 2019 15:03:08 -0400 Subject: [PATCH 14/28] Added space. OCD required a extra space to make up for the codebox --- panel/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/getting_started.md b/panel/getting_started.md index fffd5f96..5c59520d 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -30,7 +30,7 @@ this software on an OpenVZ based system you will — most likely — not ## Dependencies * PHP `7.2` with the following extensions: `cli`, `openssl`, `gd`, `mysql`, `PDO`, `mbstring`, `tokenizer`, `bcmath`, `xml` or `dom`, `curl`, `zip` -* MySQL `5.7`**or** MariaDB `10.1.3` or higher +* MySQL `5.7` **or** MariaDB `10.1.3` or higher * Redis (`redis-server`) * A webserver (Apache, NGINX, Caddy, etc.) * `curl` From d23c2f33e42a0b1a3a8609688440ef2e616d9199 Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Sat, 1 Jun 2019 13:34:31 -0700 Subject: [PATCH 15/28] Update team members --- project/about.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project/about.md b/project/about.md index a57fa819..5ebc419f 100644 --- a/project/about.md +++ b/project/about.md @@ -5,9 +5,10 @@ | Name | Discord Name | Primary Role | | ---- | ------------ | ---- | | [Dane Everitt](https://daneeveritt.com/) | `Tactical Fish#8008` | Project Maintainer | +| [Anand Capur](https://anand.io/) | `Arcdigital#1337` | Mobile/Cloud Project Lead | | Michael Parker | `parkervcp#6789` | Egg Developer, Docker Integration | | [Jakob Schrettenbrunner](https://schrej.net/) | `schrej#1337` | Golang Daemon Lead, Developer | -| [Anand Capur](https://anand.io/) | `Arcdigital#1337` | Developer | +| Stepan Fedotov | `Trixter#0001` | WHMCS Module Maintainer | | [Lance Pioch](https://lancepioch.com/) | `ShadowLancer#5209` | Developer | ## Community Team @@ -16,7 +17,7 @@ members can be found in our Discord channel and are distinguished with a yellow ## License ``` text -Copyright (c) 2015 - 2018 Dane Everitt . +Copyright (c) 2015 - 2019 Dane Everitt . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d45d8b073926f4e24bbbb2db53abc519fa2806e8 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Tue, 11 Jun 2019 00:11:31 -0400 Subject: [PATCH 16/28] Rename discord.md to community.md --- project/{discord.md => community.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename project/{discord.md => community.md} (100%) diff --git a/project/discord.md b/project/community.md similarity index 100% rename from project/discord.md rename to project/community.md From f66c0c56cecf3998095954ebb9099811f3fcd4ca Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Tue, 11 Jun 2019 00:12:59 -0400 Subject: [PATCH 17/28] Update community.md --- project/community.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project/community.md b/project/community.md index b4dbabcf..f367e11f 100644 --- a/project/community.md +++ b/project/community.md @@ -2,7 +2,8 @@ Sorry, but this file is off limits to additions or deletions that are not the result of fixing grammar or spelling mistakes. --> -# Discord Community Standards + +# Community Standards Pterodactyl prides itself on providing a warm and welcoming community for all of our members. However, due to the sheer size of our community, we have a few rules that we expect all individuals to follow at all times. @@ -71,7 +72,7 @@ allow any random hosting company to partner with us and then go under, or, be su Please review the requirements below to see if you might qualify to become a partner with us. If you believe you meet these requirements, please send an email to dane@[this domain].io. Please refrain from contacting any -of the Project Team directly on Discord, it is disruptive and rather annoying. +of the Project Team directly about this, it is disruptive and rather annoying. 1. *MUST* be able to show proof of business registration in your country. 2. *MUST* be able to show an easily found page on your company website that lists at least two (2) sources for contact From ead7d4f3b82cc142dbc332c6d97049f22c8c002e Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Tue, 11 Jun 2019 00:13:34 -0400 Subject: [PATCH 18/28] Update community.md --- project/community.md | 1 - 1 file changed, 1 deletion(-) diff --git a/project/community.md b/project/community.md index f367e11f..a3deff0c 100644 --- a/project/community.md +++ b/project/community.md @@ -2,7 +2,6 @@ Sorry, but this file is off limits to additions or deletions that are not the result of fixing grammar or spelling mistakes. --> - # Community Standards Pterodactyl prides itself on providing a warm and welcoming community for all of our members. However, due to the sheer size of our community, we have a few rules that we expect all individuals to follow at all times. From d1a17650a31cd0aa2353901e0bf49c89a7c7ea7b Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Tue, 11 Jun 2019 00:13:46 -0400 Subject: [PATCH 19/28] Update community.md --- project/community.md | 1 + 1 file changed, 1 insertion(+) diff --git a/project/community.md b/project/community.md index a3deff0c..f367e11f 100644 --- a/project/community.md +++ b/project/community.md @@ -2,6 +2,7 @@ Sorry, but this file is off limits to additions or deletions that are not the result of fixing grammar or spelling mistakes. --> + # Community Standards Pterodactyl prides itself on providing a warm and welcoming community for all of our members. However, due to the sheer size of our community, we have a few rules that we expect all individuals to follow at all times. From d3587dbd991bc32556c50d8f3be175b0d9b5aac8 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Tue, 11 Jun 2019 00:16:02 -0400 Subject: [PATCH 20/28] Update config.js --- .vuepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vuepress/config.js b/.vuepress/config.js index 610f47d8..78cbac95 100644 --- a/.vuepress/config.js +++ b/.vuepress/config.js @@ -106,7 +106,7 @@ module.exports = { '/project/introduction.md', '/project/about.md', '/project/terms.md', - '/project/discord.md', + '/project/community.md', ] }, { From d4f0625f86871cc2e1bdd7c06c78be630a10b9b0 Mon Sep 17 00:00:00 2001 From: Nuc1eoN Date: Thu, 13 Jun 2019 17:31:42 +0200 Subject: [PATCH 21/28] Link to correct point in Documentation /panel/getting_started.md#download-files is where the user should continue to read --- community/installation-guides/panel/centos7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/installation-guides/panel/centos7.md b/community/installation-guides/panel/centos7.md index d8ab3331..d8ece59c 100644 --- a/community/installation-guides/panel/centos7.md +++ b/community/installation-guides/panel/centos7.md @@ -133,4 +133,4 @@ The default Redis install is perfectly fine for the panel. If you have Redis alr [running another Redis instance](https://community.pivotal.io/s/article/How-to-setup-and-run-multiple-Redis-server-instances-on-a-Linux-host). ## Installing the Panel -Excellent, we now have all of the required dependencies installed and configured. From here, follow the [official Panel installation documentation](/panel/getting_started.md#installation). +Excellent, we now have all of the required dependencies installed and configured. From here, follow the [official Panel installation documentation](/panel/getting_started.md#download-files). From 35060350baa87c2ff3721eb76466d411453bc4f7 Mon Sep 17 00:00:00 2001 From: Nuc1eoN Date: Thu, 13 Jun 2019 17:41:43 +0200 Subject: [PATCH 22/28] Add addtional step to install unzip Unzip is required later on when using composer. Otherwise composer will issue a warning that unzip should be installed. --- community/installation-guides/panel/centos7.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/community/installation-guides/panel/centos7.md b/community/installation-guides/panel/centos7.md index d8ab3331..485978f6 100644 --- a/community/installation-guides/panel/centos7.md +++ b/community/installation-guides/panel/centos7.md @@ -68,6 +68,11 @@ systemctl enable redis ### Additional Utilities +#### Unzip +```bash +yum install -y unzip +``` + #### Certbot ```bash yum install -y certbot From be3f9f79457a4cc410c919be129415c16d253cf3 Mon Sep 17 00:00:00 2001 From: Nuc1eoN Date: Thu, 13 Jun 2019 17:53:45 +0200 Subject: [PATCH 23/28] Remove redundant instructions to install certbot Installing certbot at this point is redundant, because it is referred to later on anyways by linking to /tutorials/creating_ssl_certificates.html where the user can choose whether to use cerbot at all anyways --- community/installation-guides/panel/centos7.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/community/installation-guides/panel/centos7.md b/community/installation-guides/panel/centos7.md index d8ab3331..a6f9d1e0 100644 --- a/community/installation-guides/panel/centos7.md +++ b/community/installation-guides/panel/centos7.md @@ -68,11 +68,6 @@ systemctl enable redis ### Additional Utilities -#### Certbot -```bash -yum install -y certbot -``` - #### Composer ```bash curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer From 73fb143dbaecf84a5a63f83221000c041fe2a925 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 16 Jun 2019 17:18:20 -0400 Subject: [PATCH 24/28] update debian 8 support status Debian 8 is starting to fall behind and not get updates. this is to call out that some modifications may be required. --- panel/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/getting_started.md b/panel/getting_started.md index 5c59520d..8f669b1c 100644 --- a/panel/getting_started.md +++ b/panel/getting_started.md @@ -25,7 +25,7 @@ this software on an OpenVZ based system you will — most likely — not | | 18.04 | :white_check_mark: | | | **CentOS** | 6 | :no_entry_sign: | Does not support all of the required packages. | | | 7 | :white_check_mark: | | -| **Debian** | 8 | :white_check_mark: | | +| **Debian** | 8 | :warning: | Debian 8 may need modifications to work with the latest docker and other requirements for the panel/daemon | | | 9 | :white_check_mark: | | ## Dependencies From 76e32ccd45079053ee4cf0c4158e205a2eb7a881 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Mon, 17 Jun 2019 16:21:33 -0400 Subject: [PATCH 25/28] Update centos7.md --- community/installation-guides/panel/centos7.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/community/installation-guides/panel/centos7.md b/community/installation-guides/panel/centos7.md index 485978f6..8b301c6a 100644 --- a/community/installation-guides/panel/centos7.md +++ b/community/installation-guides/panel/centos7.md @@ -68,11 +68,6 @@ systemctl enable redis ### Additional Utilities -#### Unzip -```bash -yum install -y unzip -``` - #### Certbot ```bash yum install -y certbot @@ -80,6 +75,7 @@ yum install -y certbot #### Composer ```bash +yum install -y unzip # Required for Composer curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer ``` From 9d6d2659fd12fac2a1476b663e17e9339f6be20d Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Mon, 17 Jun 2019 16:27:43 -0400 Subject: [PATCH 26/28] Update installing.md --- daemon/installing.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/daemon/installing.md b/daemon/installing.md index 23f5e855..c3f54d3f 100644 --- a/daemon/installing.md +++ b/daemon/installing.md @@ -7,15 +7,14 @@ | ---------------- | ------- | :-------: | ----- | | **Ubuntu** | 14.04 | :warning: | Approaching EOL, not recommended for new installations. | | | 16.04 | :white_check_mark: | | -| | 18.04 | :white_check_mark: | | | **CentOS** | 6 | :no_entry_sign: | Does not support all of the required packages. | | | 7 | :white_check_mark: | | | **Debian** | 8 | :warning: | Requires [kernel modifications](debian_8_docker.md) to run Docker. | | | 9 | :white_check_mark: | | | **Alpine Linux** | 3.4+ | :warning: | Not officially supported, but reportedly works. | | **RHEL** | 7 | :warning: | Not officially supported, should work. | -| **Fedora** | 29 | :warning: | Not officially supported, should work. | | **Fedora** | 28 | :warning: | Not officially supported, should work. | +| | 29 | :warning: | Not officially supported, should work. | ## System Requirements In order to run the Daemon you will need a system capable of running Docker containers. Most VPS and almost all From bf3a4d1e841445dcd674c940f667c7d4c27a7ae6 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Mon, 17 Jun 2019 16:32:34 -0400 Subject: [PATCH 27/28] Add python-dev --- community/installation-guides/daemon/debian9.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/installation-guides/daemon/debian9.md b/community/installation-guides/daemon/debian9.md index ee73a93e..81a2edca 100644 --- a/community/installation-guides/daemon/debian9.md +++ b/community/installation-guides/daemon/debian9.md @@ -13,7 +13,7 @@ We will first begin by installing all of the Daemon's [required](/daemon/install ### General Requirements ```bash -apt install -y zip unzip tar make gcc g++ python curl gnupg +apt install -y zip unzip tar make gcc g++ python python-dev curl gnupg ``` ### Docker From 46d43b0c77a747480f6dc8fa7461d7011b5387c1 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Mon, 17 Jun 2019 16:32:53 -0400 Subject: [PATCH 28/28] Update installing.md --- daemon/installing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/installing.md b/daemon/installing.md index e99a09aa..c4134a6a 100644 --- a/daemon/installing.md +++ b/daemon/installing.md @@ -51,7 +51,7 @@ Pterodactyl's Daemon requires the following dependencies be installed on your sy * `tar` * `unzip` * `make`, `gcc` (`gcc-c++` on CentOS), `g++` -* `python`, `python-dev` +* `python` ### Installing Docker For a quick install of Docker CE, you can execute the command below: @@ -100,7 +100,7 @@ NodeJS is also super easy to install! Simply run the command below to make the p ``` bash curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - -apt -y install nodejs make gcc g++ python-dev +apt -y install nodejs make gcc g++ ``` ::: tip Other OS Distributions