Skip to content

Commit 60af459

Browse files
authored
Merge pull request #545 from Jcodeerd/master
update mysql command to mariadb
2 parents 88ec5d3 + 6b1ce13 commit 60af459

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

panel/1.0/additional_configuration.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,13 @@ reCAPTCHA can easily be disabled using the admin panel. In the Settings, select
127127
If you cannot access your panel, you can modify the database directly using the following commands.
128128

129129
```sql
130+
# If using MariaDB (v11.0.0+)
131+
mariadb -u root -p
132+
133+
# If using MySQL
130134
mysql -u root -p
135+
```
136+
```sql
131137
UPDATE panel.settings SET value = 'false' WHERE `key` = 'settings::recaptcha:enabled';
132138
```
133139

@@ -138,7 +144,13 @@ If possible you should use the panel to update your 2FA settings. If you can't a
138144
### Disable 2FA requirement
139145

140146
```sql
147+
# If using MariaDB (v11.0.0+)
148+
mariadb -u root -p
149+
150+
# If using MySQL
141151
mysql -u root -p
152+
```
153+
```sql
142154
UPDATE panel.settings SET value = 0 WHERE `key` = 'settings::pterodactyl:auth:2fa_required';
143155
```
144156

panel/1.0/getting_started.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,13 @@ continuing any further. See below to create a user and database for your Pteroda
111111
please have a look at [Setting up MySQL](/tutorials/mysql_setup.html).
112112

113113
```sql
114+
# If using MariaDB (v11.0.0+) (This is the default when installing Pterodactyl by following the documentation.)
115+
mariadb -u root -p
116+
117+
# If using MySQL
114118
mysql -u root -p
119+
```
120+
```sql
115121

116122
# Remember to change 'yourPassword' below to be a unique password
117123
CREATE USER 'pterodactyl'@'127.0.0.1' IDENTIFIED BY 'yourPassword';

tutorials/mysql_setup.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ The first step in this process is to login to the MySQL command line where we wi
1212
things setup. To do so, simply run the command below and provide the Root MySQL account's password that you setup when
1313
installing MySQL. If you do not remember doing this, chances are you can just hit enter as no password is set.
1414

15-
``` bash
15+
```sql
16+
# If using MariaDB (v11.0.0+)
17+
mariadb -u root -p
18+
19+
# If using MySQL
1620
mysql -u root -p
1721
```
1822

0 commit comments

Comments
 (0)