From eeddbff8a585aa83007f2f928aaf14f777008103 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sat, 14 Sep 2019 18:03:51 -0500
Subject: [PATCH] mediawiki - iiab_installed

---
 roles/mediawiki/tasks/enable.yml  | 44 +++++++++++++++++++++++++++
 roles/mediawiki/tasks/install.yml | 49 ++++---------------------------
 roles/mediawiki/tasks/main.yml    |  6 +++-
 3 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 roles/mediawiki/tasks/enable.yml

diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml
new file mode 100644
index 000000000..4acbe1e12
--- /dev/null
+++ b/roles/mediawiki/tasks/enable.yml
@@ -0,0 +1,44 @@
+- name: Create softlink mediawiki.conf from sites-enabled to sites-available, if mediawiki_enabled (debuntu)
+  file:
+    src: /etc/apache2/sites-available/mediawiki.conf
+    dest: /etc/apache2/sites-enabled/mediawiki.conf
+    state: link
+  when: mediawiki_enabled and is_debuntu
+
+- name: Remove mediawiki.conf if not mediawiki_enabled (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/mediawiki.conf
+    state: absent
+  when: not mediawiki_enabled and is_debuntu
+
+- name: Restart Apache service ({{ apache_service }}) to enable/disable http://box{{ mediawiki_url }}
+  systemd:
+    name: "{{ apache_service }}"
+    daemon_reload: yes
+    state: restarted
+
+- name: Add 'mediawiki' variable values to {{ iiab_ini_file }}
+  ini_file:
+    path: "{{ iiab_ini_file }}"
+    section: mediawiki
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+  with_items:
+    - option: name
+      value: mediawiki
+    - option: description
+      value: '"mediawiki is a blog and web site management application."'
+    - option: mediawiki_src
+      value: "{{ mediawiki_src }}"
+    - option: mediawiki_abs_path
+      value: "{{ mediawiki_abs_path }}"
+    - option: mediawiki_db_name
+      value: "{{ mediawiki_db_name }}"
+    - option: mediawiki_db_user
+      value: "{{ mediawiki_db_user }}"
+    - option: mediawiki_url
+      value: "{{ mediawiki_url }}"
+    - option: mediawiki_full_url
+      value: "{{ mediawiki_full_url }}"
+    - option: mediawiki_enabled
+      value: "{{ mediawiki_enabled }}"
diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml
index db90e1e6c..e39565774 100644
--- a/roles/mediawiki/tasks/install.yml
+++ b/roles/mediawiki/tasks/install.yml
@@ -65,46 +65,9 @@
     src: mediawiki.conf.j2
     dest: "/etc/{{ apache_config_dir }}/mediawiki.conf"
 
-- name: Create softlink mediawiki.conf from sites-enabled to sites-available, if mediawiki_enabled (debuntu)
-  file:
-    src: /etc/apache2/sites-available/mediawiki.conf
-    dest: /etc/apache2/sites-enabled/mediawiki.conf
-    state: link
-  when: mediawiki_enabled and is_debuntu
-
-- name: Remove mediawiki.conf if not mediawiki_enabled (debuntu)
-  file:
-    path: /etc/apache2/sites-enabled/mediawiki.conf
-    state: absent
-  when: not mediawiki_enabled and is_debuntu
-
-- name: Restart Apache service ({{ apache_service }}) to enable/disable http://box{{ mediawiki_url }}
-  systemd:
-    name: "{{ apache_service }}"
-    state: restarted
-
-- name: Add 'mediawiki' variable values to {{ iiab_ini_file }}
-  ini_file:
-    path: "{{ iiab_ini_file }}"
-    section: mediawiki
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-  with_items:
-    - option: name
-      value: mediawiki
-    - option: description
-      value: '"mediawiki is a blog and web site management application."'
-    - option: mediawiki_src
-      value: "{{ mediawiki_src }}"
-    - option: mediawiki_abs_path
-      value: "{{ mediawiki_abs_path }}"
-    - option: mediawiki_db_name
-      value: "{{ mediawiki_db_name }}"
-    - option: mediawiki_db_user
-      value: "{{ mediawiki_db_user }}"
-    - option: mediawiki_url
-      value: "{{ mediawiki_url }}"
-    - option: mediawiki_full_url
-      value: "{{ mediawiki_full_url }}"
-    - option: mediawiki_enabled
-      value: "{{ mediawiki_enabled }}"
+- name: Add 'mediawiki_installed' variable values to {{ iiab_installed }}
+  lineinfile:
+    dest: "{{ iiab_installed }}"
+    regexp: '^mediawiki_installed'
+    line: 'mediawiki_installed'
+    state: present
diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index bf0a4d795..ee96ee73b 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -1,3 +1,7 @@
 - name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install
   include_tasks: install.yml
-  when: mediawiki_install | bool
+  when: mediawiki_install | bool and not mediawiki_installed is defined
+
+- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install
+  include_tasks: enable.yml
+  when: mediawiki_install | bool or mediawiki_installed is defined