From 8c13940a991211d947de744e1cbf06cee6036abe Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sun, 1 Sep 2019 03:11:01 -0500
Subject: [PATCH] elgg rework and add iiab_installed

---
 roles/elgg/tasks/enable.yml  |  39 ++++++++
 roles/elgg/tasks/install.yml |  94 +++++++++++++++++++
 roles/elgg/tasks/main.yml    | 172 ++---------------------------------
 roles/elgg/tasks/prov-db.yml |  36 ++++++++
 4 files changed, 178 insertions(+), 163 deletions(-)
 create mode 100644 roles/elgg/tasks/enable.yml
 create mode 100644 roles/elgg/tasks/install.yml
 create mode 100644 roles/elgg/tasks/prov-db.yml

diff --git a/roles/elgg/tasks/enable.yml b/roles/elgg/tasks/enable.yml
new file mode 100644
index 000000000..19d029530
--- /dev/null
+++ b/roles/elgg/tasks/enable.yml
@@ -0,0 +1,39 @@
+- name: Create symlink elgg.conf from sites-enabled to sites-available (debuntu, not nec for redhat)
+  file:
+    src: /etc/apache2/sites-available/elgg.conf
+    path: /etc/apache2/sites-enabled/elgg.conf
+    state: link
+  when: elgg_enabled and is_debuntu
+
+- name: Remove symlink /etc/apache2/sites-enabled/elgg.conf (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/elgg.conf
+    state: absent
+  when: not elgg_enabled and is_debuntu
+
+- name: Remove Apache's elgg.conf (redhat)
+  file:
+    dest: "/etc/{{ apache_config_dir }}/elgg.conf"
+    state: absent
+  when: not elgg_enabled and is_redhat
+
+- name: Restart Apache ({{ apache_service }}) to enable/disable http://box/elgg
+  service:
+    name: "{{ apache_service }}"
+    state: restarted
+
+- name: Add 'elgg' variable values to {{ iiab_ini_file }}
+  ini_file:
+    path: "{{ iiab_ini_file }}"
+    section: elgg
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+  with_items:
+    - option: name
+      value: Elgg
+    - option: description
+      value: '"Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications."'
+    - option: path
+      value: /opt/elgg
+    - option: elgg_enabled
+      value: "{{ elgg_enabled }}"
diff --git a/roles/elgg/tasks/install.yml b/roles/elgg/tasks/install.yml
new file mode 100644
index 000000000..43495919b
--- /dev/null
+++ b/roles/elgg/tasks/install.yml
@@ -0,0 +1,94 @@
+# Assume we only get here if elgg_install: True
+# Assume MySQL is running
+
+- name: Download {{ iiab_download_url }}/elgg-{{ elgg_version }}.zip to {{ downloads_dir }}
+  #shell: wget {{ iiab_download_url }}/elgg-{{ elgg_version }}.zip -c -P {{ downloads_dir }}
+  #args:
+  #  creates: "{{ downloads_dir }}/elgg-{{ elgg_version }}.zip"
+  get_url:
+    url: "{{ iiab_download_url }}/elgg-{{ elgg_version }}.zip"
+    dest: "{{ downloads_dir }}"
+    timeout: "{{ download_timeout }}"
+  when: internet_available | bool
+
+- name: Check for existence of /opt/elgg-{{ elgg_version }}/index.php
+  stat:
+    path: "/opt/elgg-{{ elgg_version }}/index.php"
+  register: elgg
+
+- name: Unpack (unarchive) .zip to /opt, if above index.php doesn't exist
+  #shell: "/usr/bin/unzip -o {{ downloads_dir }}/elgg-{{ elgg_version }}.zip -d /opt"
+  unarchive:
+    #remote_src: yes
+    #src: "{{ iiab_download_url }}/elgg-{{ elgg_version }}.zip"
+    src: "{{ downloads_dir }}/elgg-{{ elgg_version }}.zip"
+    dest: /opt
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+  when: elgg.stat.exists is defined and not elgg.stat.exists
+
+- name: Create softlink from /opt/elgg to /opt/elgg-{{ elgg_version }}
+  file:
+    src: "./elgg-{{ elgg_version }}"
+    path: /opt/elgg
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+    state: link
+    force: yes
+
+- name: 'Install /opt/elgg/elgg-config/settings.php from template (WARNING: overwrites manual settings!)'
+  template:
+    src: "settings.php.j2"
+    dest: "/opt/{{ elgg_xx }}/elgg-config/settings.php"
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+
+# The name of this file changed from 1.9 to 1.10.
+- name: Copy default .htaccess into /opt/{{ elgg_xx }}, root of Elgg tree
+  copy:
+    src: "/opt/{{ elgg_xx }}/vendor/elgg/elgg/install/config/htaccess.dist"
+    dest: "/opt/{{ elgg_xx }}/.htaccess"
+    mode: 0644
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+
+#regexp='^#RewriteBase'
+- name: Change .htaccess to include RewriteBase for http://box/elgg
+  lineinfile:
+    backup: no
+    path: "/opt/{{ elgg_xx }}/.htaccess"
+    state: present
+    insertafter: '^#RewriteBase'
+    line: "RewriteBase {{ elgg_url }}/"
+
+- name: Set /opt/elgg/engine directory permissions to 0755 so Apache can write there
+  file:
+    path: /opt/elgg/engine/
+    owner: "{{ apache_user }}"
+    mode: 0755
+    state: directory
+
+- name: Change /opt/elgg-{{ elgg_version }} ownership to {{ apache_user }}:{{ apache_user }} (likely not nec, as unarchive & all do this above)
+  file:
+    path: "/opt/elgg-{{ elgg_version }}"
+    owner: "{{ apache_user }}"
+    group: "{{ apache_user }}"
+    recurse: yes
+    state: directory
+
+- name: Create upload directory {{ elgg_upload_path }} that Apache (and Elgg) can write to
+  file:
+    path: "{{ elgg_upload_path }}"
+    state: directory
+    owner: "{{ apache_user }}"
+
+- name: Install /etc/{{ apache_config_dir }}/elgg.conf from template, for http://box/elgg
+  template:
+    src: elgg.conf
+    dest: "/etc/{{ apache_config_dir }}/elgg.conf"
+
+- name: Add 'elgg_installed' variable values to {{ iiab_installed }}
+  ini_file:
+    path: "{{ iiab_installed }}"
+    value: elgg_installed
+
diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml
index 6461ebca1..ed859cb07 100644
--- a/roles/elgg/tasks/main.yml
+++ b/roles/elgg/tasks/main.yml
@@ -1,165 +1,11 @@
-# Assume we only get here if elgg_install: True
-# Assume MySQL is running
+- name: Install Elgg
+  include_tasks: install.yml
+  when: elgg_install and not elgg_installed is defined
 
-- name: Download {{ iiab_download_url }}/elgg-{{ elgg_version }}.zip to {{ downloads_dir }}
-  #shell: wget {{ iiab_download_url }}/elgg-{{ elgg_version }}.zip -c -P {{ downloads_dir }}
-  #args:
-  #  creates: "{{ downloads_dir }}/elgg-{{ elgg_version }}.zip"
-  get_url:
-    url: "{{ iiab_download_url }}/elgg-{{ elgg_version }}.zip"
-    dest: "{{ downloads_dir }}"
-    timeout: "{{ download_timeout }}"
-  when: internet_available | bool
+- name: Provision DB
+  include_tasks: prov-db.yml
+  when: elgg_install and not installing
 
-- name: Check for existence of /opt/elgg-{{ elgg_version }}/index.php
-  stat:
-    path: "/opt/elgg-{{ elgg_version }}/index.php"
-  register: elgg
-
-- name: Unpack (unarchive) .zip to /opt, if above index.php doesn't exist
-  #shell: "/usr/bin/unzip -o {{ downloads_dir }}/elgg-{{ elgg_version }}.zip -d /opt"
-  unarchive:
-    #remote_src: yes
-    #src: "{{ iiab_download_url }}/elgg-{{ elgg_version }}.zip"
-    src: "{{ downloads_dir }}/elgg-{{ elgg_version }}.zip"
-    dest: /opt
-    owner: "{{ apache_user }}"
-    group: "{{ apache_user }}"
-  when: elgg.stat.exists is defined and not elgg.stat.exists
-
-- name: Create softlink from /opt/elgg to /opt/elgg-{{ elgg_version }}
-  file:
-    src: "./elgg-{{ elgg_version }}"
-    path: /opt/elgg
-    owner: "{{ apache_user }}"
-    group: "{{ apache_user }}"
-    state: link
-    force: yes
-
-- name: 'Install /opt/elgg/elgg-config/settings.php from template (WARNING: overwrites manual settings!)'
-  template:
-    src: "settings.php.j2"
-    dest: "/opt/{{ elgg_xx }}/elgg-config/settings.php"
-    owner: "{{ apache_user }}"
-    group: "{{ apache_user }}"
-
-# The name of this file changed from 1.9 to 1.10.
-- name: Copy default .htaccess into /opt/{{ elgg_xx }}, root of Elgg tree
-  copy:
-    src: "/opt/{{ elgg_xx }}/vendor/elgg/elgg/install/config/htaccess.dist"
-    dest: "/opt/{{ elgg_xx }}/.htaccess"
-    mode: 0644
-    owner: "{{ apache_user }}"
-    group: "{{ apache_user }}"
-
-#regexp='^#RewriteBase'
-- name: Change .htaccess to include RewriteBase for http://box/elgg
-  lineinfile:
-    backup: no
-    path: "/opt/{{ elgg_xx }}/.htaccess"
-    state: present
-    insertafter: '^#RewriteBase'
-    line: "RewriteBase {{ elgg_url }}/"
-
-- name: Set /opt/elgg/engine directory permissions to 0755 so Apache can write there
-  file:
-    path: /opt/elgg/engine/
-    owner: "{{ apache_user }}"
-    mode: 0755
-    state: directory
-
-- name: Change /opt/elgg-{{ elgg_version }} ownership to {{ apache_user }}:{{ apache_user }} (likely not nec, as unarchive & all do this above)
-  file:
-    path: "/opt/elgg-{{ elgg_version }}"
-    owner: "{{ apache_user }}"
-    group: "{{ apache_user }}"
-    recurse: yes
-    state: directory
-
-- name: Create upload directory {{ elgg_upload_path }} that Apache (and Elgg) can write to
-  file:
-    path: "{{ elgg_upload_path }}"
-    state: directory
-    owner: "{{ apache_user }}"
-
-- name: Create Elgg's MySQL database {{ dbname }}, to be populated below - can be run more than once
-  mysql_db:
-    name: "{{ dbname }}"
-  register: create_elgg_database
-
-- name: Create user/password to access Elgg database - can be run more than once
-  mysql_user:
-    name: "{{ dbuser }}"
-    host: "{{ item }}"
-    password: "{{ dbpassword }}"
-    priv: "{{ dbname }}.*:ALL"
-  with_items:
-    - 127.0.0.1
-    - ::1
-    - localhost
-
-- name: Create /tmp/elggdb.sql from template, to load database
-  template:
-    src: "elggdb.sql.j2"
-    dest: "/tmp/elggdb.sql"
-
-# elggdb.sql obtained with mysqldump --skip-add-drop-table elggdb > elggdb.sql
-# tar up a mysqldump of freshly installed database and use it in the install to avoid the startup
-# form, which worries me a lot. (/var/lib/mysql/elggdb)
-
-- name: Populate Elgg's MySQL database {{ dbname }}, from /tmp/elggdb.sql
-  mysql_db:
-    name: "{{ dbname }}"
-    state: import
-    target: /tmp/elggdb.sql
-  when: create_elgg_database.changed
-
-- name: Remove database dump /tmp/elggdb.sql
-  file:
-    name: /tmp/elggdb.sql
-    state: absent
-
-- name: Install /etc/{{ apache_config_dir }}/elgg.conf from template, for http://box/elgg
-  template:
-    src: elgg.conf
-    dest: "/etc/{{ apache_config_dir }}/elgg.conf"
-
-- name: Create symlink elgg.conf from sites-enabled to sites-available (debuntu, not nec for redhat)
-  file:
-    src: /etc/apache2/sites-available/elgg.conf
-    path: /etc/apache2/sites-enabled/elgg.conf
-    state: link
-  when: elgg_enabled and is_debuntu
-
-- name: Remove symlink /etc/apache2/sites-enabled/elgg.conf (debuntu)
-  file:
-    path: /etc/apache2/sites-enabled/elgg.conf
-    state: absent
-  when: not elgg_enabled and is_debuntu
-
-- name: Remove Apache's elgg.conf (redhat)
-  file:
-    dest: "/etc/{{ apache_config_dir }}/elgg.conf"
-    state: absent
-  when: not elgg_enabled and is_redhat
-
-- name: Restart Apache ({{ apache_service }}) to enable/disable http://box/elgg
-  service:
-    name: "{{ apache_service }}"
-    state: restarted
-
-- name: Add 'elgg' variable values to {{ iiab_ini_file }}
-  ini_file:
-    path: "{{ iiab_ini_file }}"
-    section: elgg
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-  with_items:
-    - option: name
-      value: Elgg
-    - option: description
-      value: '"Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications."'
-    - option: path
-      value: /opt/elgg
-    - option: elgg_enabled
-      value: "{{ elgg_enabled }}"
+- name: Enable Elgg
+  include_tasks: enable.yml
+  when: elgg_install or elgg_installed is defined
diff --git a/roles/elgg/tasks/prov-db.yml b/roles/elgg/tasks/prov-db.yml
new file mode 100644
index 000000000..66ded083f
--- /dev/null
+++ b/roles/elgg/tasks/prov-db.yml
@@ -0,0 +1,36 @@
+- name: Create Elgg's MySQL database {{ dbname }}, to be populated below - can be run more than once
+  mysql_db:
+    name: "{{ dbname }}"
+  register: create_elgg_database
+
+- name: Create user/password to access Elgg database - can be run more than once
+  mysql_user:
+    name: "{{ dbuser }}"
+    host: "{{ item }}"
+    password: "{{ dbpassword }}"
+    priv: "{{ dbname }}.*:ALL"
+  with_items:
+    - 127.0.0.1
+    - ::1
+    - localhost
+
+- name: Create /tmp/elggdb.sql from template, to load database
+  template:
+    src: "elggdb.sql.j2"
+    dest: "/tmp/elggdb.sql"
+
+# elggdb.sql obtained with mysqldump --skip-add-drop-table elggdb > elggdb.sql
+# tar up a mysqldump of freshly installed database and use it in the install to avoid the startup
+# form, which worries me a lot. (/var/lib/mysql/elggdb)
+
+- name: Populate Elgg's MySQL database {{ dbname }}, from /tmp/elggdb.sql
+  mysql_db:
+    name: "{{ dbname }}"
+    state: import
+    target: /tmp/elggdb.sql
+  when: create_elgg_database.changed
+
+- name: Remove database dump /tmp/elggdb.sql
+  file:
+    name: /tmp/elggdb.sql
+    state: absent