From 50ced1eec845004562bce7e45cb23b43eabf2868 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Oct 2017 09:40:47 -0400 Subject: [PATCH] cleaner Ansible messaging --- roles/elgg/tasks/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml index f78dba717..d76b35fe4 100644 --- a/roles/elgg/tasks/main.yml +++ b/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 copy +- name: Download current version from our copy shell: wget {{ iiab_download_url }}/elgg-{{ elgg_version }}.zip -c -P {{ downloads_dir }} creates={{ downloads_dir }}/elgg-{{ elgg_version }}.zip when: internet_available @@ -18,7 +18,7 @@ shell: "/usr/bin/unzip -o {{ downloads_dir }}/elgg-{{ elgg_version }}.zip -d /opt" when: elgg.stat.exists is defined and not elgg.stat.exists -- name: Create a link to the versioned elgg folder +- name: Create a link to the versioned elgg-* folder file: src=./elgg-{{ elgg_version }} dest=/opt/elgg owner={{ apache_user }} @@ -36,7 +36,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 to the root directory of Elgg tree copy: src="/opt/{{ elgg_xx }}/vendor/elgg/elgg/install/config/htaccess.dist" dest="/opt/{{ elgg_xx }}/.htaccess" mode=0644 @@ -51,13 +51,13 @@ insertafter='^#RewriteBase' line="RewriteBase {{ elgg_url }}/" -- name: Change permissions on engine directory so apache can write +- name: Change permissions on engine directory so Apache can write file: path=/opt/elgg/engine/ owner={{ apache_user }} mode=0755 state=directory - name: Create an upload directory that Apache can write in or elgg file: path={{ elgg_upload_path }} state=directory owner={{ apache_user }} -- name: change ownership +- name: Change ownership file: path=/opt/elgg-{{ elgg_version }} owner={{ apache_user }} group={{ apache_user }} @@ -68,7 +68,7 @@ mysql_db: name={{ dbname }} register: create_elgg_database -- name: Create a user to access the elgg database - can be run more than once +- name: Create a user to access the 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 @@ -95,23 +95,23 @@ - name: Install config file for elgg in Apache template: src=elgg.conf dest=/etc/{{ apache_config_dir }}/elgg.conf -- name: Enable elgg for debuntu (will already be enabled above for Redhat) +- name: Enable Elgg for debuntu (will already be enabled above for Redhat) file: path=/etc/apache2/sites-enabled/elgg.conf src=/etc/apache2/sites-available/elgg.conf state=link when: elgg_enabled and is_debuntu -- name: Disable elgg for debuntu +- name: Disable Elgg for debuntu file: path=/etc/apache2/sites-enabled/elgg.conf state=absent when: not elgg_enabled and is_debuntu -- name: Disable elgg for Redhat - remove config file for elgg in Apache +- name: Disable Elgg for Redhat - remove config file for Elgg in Apache file: dest=/etc/{{ apache_config_dir }}/elgg.conf state=absent when: not elgg_enabled and is_redhat -- name: add elgg to service list +- name: Add Elgg to service list ini_file: dest='{{ service_filelist }}' section=elgg option='{{ item.option }}'