From 0e25ca55841b89be98d22eee0e706348f69b70fb Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 9 Aug 2018 23:01:33 +0200
Subject: [PATCH] Fix #342 phpMyAdmin config permission error

---
 .../htdocs/vendor/phpmyadmin-4.0/config.inc.php  |  2 ++
 .../htdocs/vendor/phpmyadmin-4.8/config.inc.php  |  2 ++
 CONTRIBUTING.md                                  | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php b/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php
index 26c1382d..bdc996d8 100644
--- a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php
+++ b/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php
@@ -15,6 +15,8 @@
  * cookie. Needs to be 32 chars long.
  */
 $cfg['blowfish_secret'] = 'GObO60^(04#^5637%fdUGo(*6$%6#dy4'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['CheckConfigurationPermissions'] = false;
+
 
 /**
  * Servers configuration
diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.8/config.inc.php b/.devilbox/www/htdocs/vendor/phpmyadmin-4.8/config.inc.php
index 97f8d6db..0ecc8b2e 100644
--- a/.devilbox/www/htdocs/vendor/phpmyadmin-4.8/config.inc.php
+++ b/.devilbox/www/htdocs/vendor/phpmyadmin-4.8/config.inc.php
@@ -14,6 +14,8 @@
  * Custom overwrites
  */
 $cfg['TempDir'] = '/tmp';
+$cfg['CheckConfigurationPermissions'] = false;
+
 
 /**
  * This is needed for cookie based authentication to encrypt password in
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6b04dbdf..6456c833 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,3 +21,19 @@ Please see [ROADMAP](https://github.com/cytopia/devilbox/issues/23) for what is
 * [ ] Better layout
 * [ ] Better logos
 * [ ] Try to remove as much vendor dependencies as possible
+
+## Updating Vendors
+
+#### phpMyAdmin
+
+The following settings must be applied to `config.inc.php`:
+```php
+<?php
+$cfg['TempDir'] = '/tmp';
+$cfg['CheckConfigurationPermissions'] = false;
+
+$cfg['blowfish_secret'] = 'add whatever value here';
+
+$cfg['Servers'][$i]['host'] = 'mysql';
+$cfg['Servers'][$i]['AllowNoPassword'] = true;
+```