From 28460757f49cf369a67a564a1ede478ded5f3ec2 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Thu, 14 Sep 2023 23:38:39 +0200 Subject: [PATCH 01/12] update mysql command to mariadb --- panel/1.0/additional_configuration.md | 4 ++-- panel/1.0/getting_started.md | 2 +- tutorials/mysql_setup.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panel/1.0/additional_configuration.md b/panel/1.0/additional_configuration.md index 8fa887f8b..6575a724a 100644 --- a/panel/1.0/additional_configuration.md +++ b/panel/1.0/additional_configuration.md @@ -127,7 +127,7 @@ reCAPTCHA can easily be disabled using the admin panel. In the Settings, select If you cannot access your panel, you can modify the database directly using the following commands. ```sql -mysql -u root -p +mariadb -u root -p UPDATE panel.settings SET value = 'false' WHERE `key` = 'settings::recaptcha:enabled'; ``` @@ -138,7 +138,7 @@ If possible you should use the panel to update your 2FA settings. If you can't a ### Disable 2FA requirement ```sql -mysql -u root -p +mariadb -u root -p UPDATE panel.settings SET value = 0 WHERE `key` = 'settings::pterodactyl:auth:2fa_required'; ``` diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index c8dc90e6d..b385ada6f 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -115,7 +115,7 @@ continuing any further. See below to create a user and database for your Pteroda please have a look at [Setting up MySQL](/tutorials/mysql_setup.html). ```sql -mysql -u root -p +mariadb -u root -p # Remember to change 'yourPassword' below to be a unique password CREATE USER 'pterodactyl'@'127.0.0.1' IDENTIFIED BY 'yourPassword'; diff --git a/tutorials/mysql_setup.md b/tutorials/mysql_setup.md index 14f1c6428..3c4256184 100644 --- a/tutorials/mysql_setup.md +++ b/tutorials/mysql_setup.md @@ -13,7 +13,7 @@ things setup. To do so, simply run the command below and provide the Root MySQL installing MySQL. If you do not remember doing this, chances are you can just hit enter as no password is set. ``` bash -mysql -u root -p +mariadb -u root -p ``` ### Creating a user From 38555a646cfaff113c3460e73b080589413db395 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:37:17 +0200 Subject: [PATCH 02/12] Update additional_configuration.md --- panel/1.0/additional_configuration.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/panel/1.0/additional_configuration.md b/panel/1.0/additional_configuration.md index 6575a724a..ecdfa6828 100644 --- a/panel/1.0/additional_configuration.md +++ b/panel/1.0/additional_configuration.md @@ -127,7 +127,13 @@ reCAPTCHA can easily be disabled using the admin panel. In the Settings, select If you cannot access your panel, you can modify the database directly using the following commands. ```sql +# If using MySQL +mysql -u root -p + +# If using MariaDB (V11.0.0+) mariadb -u root -p +``` +```sql UPDATE panel.settings SET value = 'false' WHERE `key` = 'settings::recaptcha:enabled'; ``` From 8412ffefa6e4ef87d7a583c998fee39fbda877be Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:38:00 +0200 Subject: [PATCH 03/12] Update additional_configuration.md --- panel/1.0/additional_configuration.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/panel/1.0/additional_configuration.md b/panel/1.0/additional_configuration.md index ecdfa6828..bd89437c3 100644 --- a/panel/1.0/additional_configuration.md +++ b/panel/1.0/additional_configuration.md @@ -144,7 +144,13 @@ If possible you should use the panel to update your 2FA settings. If you can't a ### Disable 2FA requirement ```sql +# If using MySQL +mysql -u root -p + +# If using MariaDB (V11.0.0+) mariadb -u root -p +``` +```sql UPDATE panel.settings SET value = 0 WHERE `key` = 'settings::pterodactyl:auth:2fa_required'; ``` From 5f38cb1224dcef33c8975160ab8036c2e77d7ae0 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:38:41 +0200 Subject: [PATCH 04/12] Update getting_started.md --- panel/1.0/getting_started.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index b385ada6f..7c90d95f5 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -115,7 +115,13 @@ continuing any further. See below to create a user and database for your Pteroda please have a look at [Setting up MySQL](/tutorials/mysql_setup.html). ```sql +# If using MySQL +mysql -u root -p + +# If using MariaDB (V11.0.0+) mariadb -u root -p +``` +```sql # Remember to change 'yourPassword' below to be a unique password CREATE USER 'pterodactyl'@'127.0.0.1' IDENTIFIED BY 'yourPassword'; From fe22343c6b1cc1e61a6dfe0513f870fe084e2618 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:39:01 +0200 Subject: [PATCH 05/12] Update mysql_setup.md --- tutorials/mysql_setup.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tutorials/mysql_setup.md b/tutorials/mysql_setup.md index 3c4256184..773c5668d 100644 --- a/tutorials/mysql_setup.md +++ b/tutorials/mysql_setup.md @@ -12,7 +12,11 @@ The first step in this process is to login to the MySQL command line where we wi things setup. To do so, simply run the command below and provide the Root MySQL account's password that you setup when installing MySQL. If you do not remember doing this, chances are you can just hit enter as no password is set. -``` bash +```sql +# If using MySQL +mysql -u root -p + +# If using MariaDB (V11.0.0+) mariadb -u root -p ``` From 756a25df78e92a59366138e51146eeb31b161488 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:54:22 +0200 Subject: [PATCH 06/12] put mariadb first --- panel/1.0/additional_configuration.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/panel/1.0/additional_configuration.md b/panel/1.0/additional_configuration.md index bd89437c3..3190c2bb2 100644 --- a/panel/1.0/additional_configuration.md +++ b/panel/1.0/additional_configuration.md @@ -127,11 +127,11 @@ reCAPTCHA can easily be disabled using the admin panel. In the Settings, select If you cannot access your panel, you can modify the database directly using the following commands. ```sql -# If using MySQL -mysql -u root -p - # If using MariaDB (V11.0.0+) mariadb -u root -p + +# If using MySQL +mysql -u root -p ``` ```sql UPDATE panel.settings SET value = 'false' WHERE `key` = 'settings::recaptcha:enabled'; @@ -144,11 +144,11 @@ If possible you should use the panel to update your 2FA settings. If you can't a ### Disable 2FA requirement ```sql -# If using MySQL -mysql -u root -p - # If using MariaDB (V11.0.0+) mariadb -u root -p + +# If using MySQL +mysql -u root -p ``` ```sql UPDATE panel.settings SET value = 0 WHERE `key` = 'settings::pterodactyl:auth:2fa_required'; From 80a3771329d52025b245e55b94d9cb3a2a8dbb4f Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:54:54 +0200 Subject: [PATCH 07/12] Update getting_started.md put mariadb first --- panel/1.0/getting_started.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index 7c90d95f5..2caf6b079 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -115,11 +115,11 @@ continuing any further. See below to create a user and database for your Pteroda please have a look at [Setting up MySQL](/tutorials/mysql_setup.html). ```sql -# If using MySQL -mysql -u root -p - # If using MariaDB (V11.0.0+) mariadb -u root -p + +# If using MySQL +mysql -u root -p ``` ```sql From 6b3f037f16e868074a3a8a5d95f5b4a2f1a53a7a Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:55:14 +0200 Subject: [PATCH 08/12] Update mysql_setup.md put mariadb first --- tutorials/mysql_setup.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorials/mysql_setup.md b/tutorials/mysql_setup.md index 773c5668d..17a348e62 100644 --- a/tutorials/mysql_setup.md +++ b/tutorials/mysql_setup.md @@ -13,11 +13,11 @@ things setup. To do so, simply run the command below and provide the Root MySQL installing MySQL. If you do not remember doing this, chances are you can just hit enter as no password is set. ```sql -# If using MySQL -mysql -u root -p - # If using MariaDB (V11.0.0+) mariadb -u root -p + +# If using MySQL +mysql -u root -p ``` ### Creating a user From 185d2eeb63badd74c061b83dfb97854f30fff9ba Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:48:39 +0200 Subject: [PATCH 09/12] Change uppercase V to lowercase v --- panel/1.0/additional_configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/1.0/additional_configuration.md b/panel/1.0/additional_configuration.md index 3190c2bb2..7746ed89c 100644 --- a/panel/1.0/additional_configuration.md +++ b/panel/1.0/additional_configuration.md @@ -127,7 +127,7 @@ reCAPTCHA can easily be disabled using the admin panel. In the Settings, select If you cannot access your panel, you can modify the database directly using the following commands. ```sql -# If using MariaDB (V11.0.0+) +# If using MariaDB (v11.0.0+) mariadb -u root -p # If using MySQL @@ -144,7 +144,7 @@ If possible you should use the panel to update your 2FA settings. If you can't a ### Disable 2FA requirement ```sql -# If using MariaDB (V11.0.0+) +# If using MariaDB (v11.0.0+) mariadb -u root -p # If using MySQL From 55444a359af9c4e2c85346db3ad95fd61f40d61a Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:49:02 +0200 Subject: [PATCH 10/12] Change uppercase V to lowercase v --- panel/1.0/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index 2caf6b079..3e6ed11a3 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -115,7 +115,7 @@ continuing any further. See below to create a user and database for your Pteroda please have a look at [Setting up MySQL](/tutorials/mysql_setup.html). ```sql -# If using MariaDB (V11.0.0+) +# If using MariaDB (v11.0.0+) mariadb -u root -p # If using MySQL From ec76b6759d54a37bec75761c93d2bcc8847c8530 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:49:20 +0200 Subject: [PATCH 11/12] Change uppercase V to lowercase v --- tutorials/mysql_setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/mysql_setup.md b/tutorials/mysql_setup.md index 17a348e62..c51c7e18d 100644 --- a/tutorials/mysql_setup.md +++ b/tutorials/mysql_setup.md @@ -13,7 +13,7 @@ things setup. To do so, simply run the command below and provide the Root MySQL installing MySQL. If you do not remember doing this, chances are you can just hit enter as no password is set. ```sql -# If using MariaDB (V11.0.0+) +# If using MariaDB (v11.0.0+) mariadb -u root -p # If using MySQL From a229982e80f1bf800346fcd83ab839eec7b119d0 Mon Sep 17 00:00:00 2001 From: Jcodeerd <68161666+Jcodeerd@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:50:31 +0200 Subject: [PATCH 12/12] Add note that mariadb is default --- panel/1.0/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index 3e6ed11a3..bab0110f1 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -115,7 +115,7 @@ continuing any further. See below to create a user and database for your Pteroda please have a look at [Setting up MySQL](/tutorials/mysql_setup.html). ```sql -# If using MariaDB (v11.0.0+) +# If using MariaDB (v11.0.0+) (This is the default when installing Pterodactyl by following the documentation.) mariadb -u root -p # If using MySQL