Skip to content

Commit

Permalink
Merge pull request #545 from Jcodeerd/master
Browse files Browse the repository at this point in the history
update mysql command to mariadb
  • Loading branch information
rowansc1 authored Sep 29, 2024
2 parents 88ec5d3 + 6b1ce13 commit 60af459
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
12 changes: 12 additions & 0 deletions panel/1.0/additional_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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';
```

Expand All @@ -138,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 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';
```

Expand Down
6 changes: 6 additions & 0 deletions panel/1.0/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,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 MariaDB (v11.0.0+) (This is the default when installing Pterodactyl by following the documentation.)
mariadb -u root -p

# If using MySQL
mysql -u root -p
```
```sql

# Remember to change 'yourPassword' below to be a unique password
CREATE USER 'pterodactyl'@'127.0.0.1' IDENTIFIED BY 'yourPassword';
Expand Down
6 changes: 5 additions & 1 deletion tutorials/mysql_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 MariaDB (v11.0.0+)
mariadb -u root -p

# If using MySQL
mysql -u root -p
```

Expand Down

0 comments on commit 60af459

Please sign in to comment.