From c1dd54ea231aa5742cfb898a7724a49e4ba07a2a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 21:59:51 -0500 Subject: [PATCH] Update phpmyadmin/tasks/main.yml --- roles/phpmyadmin/tasks/main.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/roles/phpmyadmin/tasks/main.yml b/roles/phpmyadmin/tasks/main.yml index 795bed675..2dd6f3cc5 100644 --- a/roles/phpmyadmin/tasks/main.yml +++ b/roles/phpmyadmin/tasks/main.yml @@ -3,7 +3,6 @@ url: "{{ iiab_download_url }}/{{ phpmyadmin_name_zip }}" dest: "{{ downloads_dir }}" timeout: "{{ download_timeout }}" - #register: phpmyadmin_dl_output when: internet_available | bool - name: Does {{ downloads_dir }}/{{ phpmyadmin_name_zip }} exist? # e.g. /opt/iiab/downloads/phpMyAdmin-4.8.3-all-languages.zip @@ -16,20 +15,20 @@ 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 }} +- name: Unzip to permanent location /opt/{{ phpmyadmin_name }}, owned by {{ apache_user }} unarchive: src: "{{ downloads_dir }}/{{ phpmyadmin_name_zip }}" dest: /opt owner: "{{ apache_user }}" -- name: Create symlink from /opt/phpmyadmin to {{ phpmyadmin_name }} +- name: Symlink /opt/phpmyadmin -> {{ phpmyadmin_name }} file: src: "{{ phpmyadmin_name }}" path: /opt/phpmyadmin - owner: "{{ apache_user }}" + owner: "{{ apache_user }}" # Some Linux's ignore symlink owners? state: link -- name: Install /opt/phpmyadmin/config.inc.php from template +- name: Install /opt/phpmyadmin/config.inc.php owned by {{ apache_user }}, from template template: src: config.inc.php dest: /opt/phpmyadmin/config.inc.php @@ -46,6 +45,13 @@ # # recurse: yes # # state: directory +- name: "Add 'phpmyadmin_installed: True' to {{ iiab_state_file }}" + lineinfile: + dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml + regexp: '^phpmyadmin_installed' + line: 'phpmyadmin_installed: True' + + - name: Install /etc/{{ apache_config_dir }}/phpmyadmin.conf from template, if phpmyadmin_enabled template: src: phpmyadmin.j2 @@ -65,6 +71,7 @@ state: absent when: not phpmyadmin_enabled and is_debuntu + - name: Add 'phpmyadmin' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}"