Merge pull request #1264 from holta/elgg-warnings

Clarify roles/elgg/tasks/main.yml

roles/elgg/tasks/main.yml

@@ -1,7 +1,7 @@
 # Assume we only get here if elgg_install: True
 # Assume MySQL is running
 
-- name: Download current version from our site
+- 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"
@@ -11,12 +11,12 @@
     timeout: "{{ download_timeout }}"
   when: internet_available
 
-- name: Determine if software is already expanded
+- name: Check for existence of /opt/elgg-{{ elgg_version }}/index.php
   stat:
     path: "/opt/elgg-{{ elgg_version }}/index.php"
   register: elgg
 
-- name: Expand it to our location unless already done
+- 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
@@ -27,10 +27,10 @@
     group: "{{ apache_user }}"
   when: elgg.stat.exists is defined and not elgg.stat.exists
 
-- name: Create a link to the versioned elgg-* folder
+- name: Create softlink from /opt/elgg to /opt/elgg-{{ elgg_version }}
   file:
     src: "./elgg-{{ elgg_version }}"
-    dest: /opt/elgg
+    path: /opt/elgg
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"
     state: link
@@ -44,7 +44,7 @@
     group: "{{ apache_user }}"
 
 # The name of this file changed from 1.9 to 1.10.
-- name: Copy default .htaccess to the root directory of Elgg tree
+- 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"
@@ -53,28 +53,22 @@
     group: "{{ apache_user }}"
 
 #regexp='^#RewriteBase'
-- name: Modify .htaccess to have RewriteBase as our directory
+- name: Change .htaccess to include RewriteBase for http://box/elgg
   lineinfile:
     backup: no
-    dest: "/opt/{{ elgg_xx }}/.htaccess"
+    path: "/opt/{{ elgg_xx }}/.htaccess"
     state: present
     insertafter: '^#RewriteBase'
     line: "RewriteBase {{ elgg_url }}/"
 
-- name: Change permissions on engine directory so Apache can write
+- 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: Create an upload directory that Apache can write in or Elgg
+- name: Change /opt/elgg-{{ elgg_version }} ownership to {{ apache_user }}:{{ apache_user }} (likely not nec, as unarchive & all do this above)
-  file:
-    path: "{{ elgg_upload_path }}"
-    state: directory
-    owner: "{{ apache_user }}"
-
-- name: Change ownership (likely not nec, unarchive & all do this above)
   file:
     path: "/opt/elgg-{{ elgg_version }}"
     owner: "{{ apache_user }}"
@@ -82,7 +76,13 @@
     recurse: yes
     state: directory
 
-- name: Create a MySQL database for Elgg - can be run more than once
+- 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
@@ -107,7 +107,7 @@
 # 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: Load Elgg database from /tmp/elggdb.sql
+- name: Populate Elgg's MySQL database {{ dbname }}, from /tmp/elggdb.sql
   mysql_db:
     name: "{{ dbname }}"
     state: import