From f3dcf94cb0de54447d06791b4ac900b868875603 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 2 Jun 2015 21:15:34 -0500
Subject: [PATCH] PR #111: Replace phpMyAdmin with Adminer.

---
 README.md                     | 4 ++--
 example.config.yml            | 3 ++-
 prod/README.md                | 2 +-
 provisioning/playbook.yml     | 2 +-
 provisioning/requirements.txt | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0a6b33f1e..9b8e9b744 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
     - Memcached
     - XHProf, for profiling your code
     - XDebug, for debugging your code
-    - PHPMyAdmin, for accessing databases directly
+    - Adminer, for accessing databases directly
     - Pimp my Log, for easy viewing of log files
     - MailHog, for catching and debugging email
 
@@ -78,9 +78,9 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 By default, this VM includes the extras listed in the `config.yml` option `installed_extras`:
 
     installed_extras:
+      - adminer
       - mailhog
       - memcached
-      - phpmyadmin
       - solr
       - xdebug
       - xhprof
diff --git a/example.config.yml b/example.config.yml
index af2fc711a..9063bacd6 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -72,9 +72,9 @@ mysql_users:
 
 # Comment out any extra utilities you don't want to install.
 installed_extras:
+  - adminer
   - mailhog
   - memcached
-  - phpmyadmin
   - pimpmylog
   # - solr
   - xdebug
@@ -116,6 +116,7 @@ php_opcache_max_accelerated_files: 4096
 # MySQL Configuration.
 mysql_slow_query_log_enabled: true
 mysql_slow_query_time: 2
+adminer_add_apache_config: true
 
 # Pimp my Log settings.
 pimpmylog_install_dir: /usr/share/php/pimpmylog
diff --git a/prod/README.md b/prod/README.md
index 7e40de8e1..489e8561b 100644
--- a/prod/README.md
+++ b/prod/README.md
@@ -31,7 +31,7 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
 Just like you would with the normal `example.config.yml`, you need to customize `example-prod.config.yml` for your site, and move the configuration file into the root directory of the project (in the same directory as the Vagrantfile).
 
-The main differences between the prod example `config.yml` and the normal example is that all development-environment tools (like Pimp My Log and PHPMyAdmin) are _not_ installed, and some extra security hardening configuration is added (via the `extra_security_enabled` variable).
+The main differences between the prod example `config.yml` and the normal example is that all development-environment tools (like Pimp My Log and Adminer) are _not_ installed, and some extra security hardening configuration is added (via the `extra_security_enabled` variable).
 
 The only other thing you need to change, after copying and configuring `example-prod.config.yml`, is the inventory file at `prod/inventory`. By default, it reads:
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d0254c63d..c4cbfb8eb 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -29,7 +29,7 @@
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }
     - { role: geerlingguy.php-xhprof, when: '"xhprof" in installed_extras' }
-    - { role: geerlingguy.phpmyadmin, when: '"phpmyadmin" in installed_extras' }
+    - { role: geerlingguy.adminer, when: '"adminer" in installed_extras' }
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
index f9423e958..00842e914 100644
--- a/provisioning/requirements.txt
+++ b/provisioning/requirements.txt
@@ -1,3 +1,4 @@
+geerlingguy.adminer
 geerlingguy.apache
 geerlingguy.composer
 geerlingguy.daemonize
@@ -15,7 +16,6 @@ geerlingguy.php-mysql
 geerlingguy.php-pecl
 geerlingguy.php-xdebug
 geerlingguy.php-xhprof
-geerlingguy.phpmyadmin
 geerlingguy.pimpmylog
 geerlingguy.repo-remi
 geerlingguy.security