From 209d372fc82eb1b9a9cf164f2d77627ef813163c Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 15 Oct 2020 14:35:41 -0400
Subject: [PATCH 1/3] phpMyAdmin 5.0.3 -> 5.0.4

---
 roles/phpmyadmin/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/phpmyadmin/defaults/main.yml b/roles/phpmyadmin/defaults/main.yml
index 90aa9e2ed..59998f26c 100644
--- a/roles/phpmyadmin/defaults/main.yml
+++ b/roles/phpmyadmin/defaults/main.yml
@@ -4,5 +4,5 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-phpmyadmin_name: "phpMyAdmin-5.0.3-all-languages"    # D/l from http://download.iiab.io/packages
+phpmyadmin_name: "phpMyAdmin-5.0.4-all-languages"    # D/l from http://download.iiab.io/packages
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"

From 40d875b950c58acfa4c20503d4e0370aefd509d0 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 15 Oct 2020 18:37:49 -0400
Subject: [PATCH 2/3] Update phpmyadmin/defaults/main.yml

---
 roles/phpmyadmin/defaults/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/phpmyadmin/defaults/main.yml b/roles/phpmyadmin/defaults/main.yml
index 59998f26c..359673189 100644
--- a/roles/phpmyadmin/defaults/main.yml
+++ b/roles/phpmyadmin/defaults/main.yml
@@ -4,5 +4,7 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-phpmyadmin_name: "phpMyAdmin-5.0.4-all-languages"    # D/l from http://download.iiab.io/packages
+phpmyadmin_version: 5.0.4
+phpmyadmin_name: "phpMyAdmin-{{ phpmyadmin_version }}-all-languages"
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"
+phpmyadmin_dl_url: "https://files.phpmyadmin.net/phpMyAdmin/{{ phpmyadmin_version }}/{{ phpmyadmin_name_zip }}"

From 406dfaedfa0473963e2a5db3b378ec4128f9d301 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 15 Oct 2020 18:39:35 -0400
Subject: [PATCH 3/3] Update phpmyadmin/tasks/install.yml

---
 roles/phpmyadmin/tasks/install.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/phpmyadmin/tasks/install.yml b/roles/phpmyadmin/tasks/install.yml
index eb52e30fe..a80fb2fdd 100644
--- a/roles/phpmyadmin/tasks/install.yml
+++ b/roles/phpmyadmin/tasks/install.yml
@@ -8,24 +8,24 @@
     name: httpd
 
 
-- name: Download {{ iiab_download_url }}/{{ phpmyadmin_name_zip }} to {{ downloads_dir }}
+- name: Download {{ phpmyadmin_dl_url }} to {{ downloads_dir }}
   get_url:
-    url: "{{ iiab_download_url }}/{{ phpmyadmin_name_zip }}"    # e.g. http://download.iiab.io/packages/phpMyAdmin-5.0.3-all-languages.zip
-    dest: "{{ downloads_dir }}"
-    timeout: "{{ download_timeout }}"
+    url: "{{ phpmyadmin_dl_url }}"    # e.g. https://files.phpmyadmin.net/phpMyAdmin/5.0.4/phpMyAdmin-5.0.4-all-languages.zip
+    dest: "{{ downloads_dir }}"    # /opt/iiab/downloads
+    timeout: "{{ download_timeout }}"    # 200
   when: internet_available | bool
 
 - name: Does {{ downloads_dir }}/{{ phpmyadmin_name_zip }} exist?
   stat:
-    path: "{{ downloads_dir }}/{{ phpmyadmin_name_zip }}"    # e.g. /opt/iiab/downloads/phpMyAdmin-5.0.3-all-languages.zip
+    path: "{{ downloads_dir }}/{{ phpmyadmin_name_zip }}"    # e.g. /opt/iiab/downloads/phpMyAdmin-5.0.4-all-languages.zip
   register: phpmyadmin_dl
 
-- name: FAIL (force Ansible to exit) IF /opt/iiab/downloads/{{ phpmyadmin_name_zip }} doesn't exist
+- name: FAIL (force Ansible to exit) IF {{ downloads_dir }}/{{ phpmyadmin_name_zip }} doesn't exist
   fail:
     msg: "{{ downloads_dir }}/{{ phpmyadmin_name_zip }} is REQUIRED in order to install phpMyAdmin."
   when: not phpmyadmin_dl.stat.exists
 
-- name: Unzip to permanent location /opt/{{ phpmyadmin_name }}, owned by {{ apache_user }}
+- name: Unzip to permanent location /opt/{{ phpmyadmin_name }}, owned by {{ apache_user }}:root    # e.g. /opt/phpMyAdmin-5.0.4-all-languages, owned by www-data:root
   unarchive:
     src: "{{ downloads_dir }}/{{ phpmyadmin_name_zip }}"
     dest: /opt
@@ -38,7 +38,7 @@
     owner: "{{ apache_user }}"    # Some Linux's ignore symlink owners?
     state: link
 
-- name: Install /opt/phpmyadmin/config.inc.php owned by {{ apache_user }}, from template
+- name: Install /opt/phpmyadmin/config.inc.php owned by {{ apache_user }}:root, from template
   template:
     src: config.inc.php
     dest: /opt/phpmyadmin/config.inc.php