Merge branch 'master' into mariadb-10.4

basilhendroff · Oct 25, 2020 · 3ff57af · 3ff57af
2 parents b5b34e1 + ea22d53
commit 3ff57af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/POST-INSTALL.md b/POST-INSTALL.md
@@ -54,7 +54,7 @@ For WordPress to use Redis, install and activate the Redis Object Cache plugin.
 
 ### phpMyAdmin Considerations
 
-You can log in to phpMyAdmin, with your database `wordpress` username and password, using the jail FQDN instead of the jail IP e.g. `https://blog.mydomain.com/phpmyadmin`. 
+You can log in to phpMyAdmin, with your database `wordpress` username and password, using the jail FQDN instead of the jail IP e.g. `https://blog.mydomain.com/phpmyadmin`. Follow the signposts to store phpMyAdmin configuration data in the `phpmyadmin` database.
 
 **CAUTION**
 >SECURITY NOTE: phpMyAdmin is an administrative tool that has had several remote vulnerabilities discovered in the past, some allowing remote attackers to execute arbitrary code with the web server's user credential. All known problems have been fixed, but the FreeBSD Security Team strongly advises that any instance be protected with an additional protection layer, e.g. a different access control mechanism implemented by the web server as shown in the example.  Do consider enabling phpMyAdmin only when it is in use.

diff --git a/wordpress-jail.sh b/wordpress-jail.sh
@@ -258,7 +258,7 @@ iocage exec "${JAIL_NAME}" sysrc mysql_enable="YES"
 iocage exec "${JAIL_NAME}" service mysql-server start
 
 #####################################################################
-print_msg "Create and secure the WordPress database..."
+print_msg "Create and secure the WordPress and phpMyAdmin databases..."
 
 # Create the database.
 iocage exec "${JAIL_NAME}" mysql -e "CREATE DATABASE wordpress;"