From ff378c49339dfea95fe3b694fdbe094a6606f32b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 5 Nov 2017 01:44:34 -0400 Subject: [PATCH] Tighter messaging --- roles/nextcloud/tasks/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 06e8c9bfc..67019a3b2 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -9,14 +9,14 @@ # but we use the tar file to get the latest version - name: Get the Nextcloud software - get_url: url={{ nextcloud_dl_url }}/{{ nextcloud_src_file }} dest={{ downloads_dir }}/{{ nextcloud_src_file }} + get_url: url={{ nextcloud_dl_url }}/{{ nextcloud_src_file }} dest={{ downloads_dir }}/{{ nextcloud_src_file }} when: internet_available async: 900 poll: 15 tags: - download -- name: Ubuntu and Debian treat names differently +- name: Ubuntu and Debian treat names differently (debian) package: name={{ item }} state=present with_items: - libapache2-mod-php{{ php_version }} @@ -24,7 +24,7 @@ - php{{ php_version }}-zip when: is_debian -- name: Ubuntu and Debian treat names differently +- name: Ubuntu and Debian treat names differently (ubuntu) package: name={{ item }} state=present with_items: - libapache2-mod-php @@ -33,7 +33,7 @@ - php-mbstring when: is_ubuntu -- name: Install list of packages for debuntu +- name: Install list of packages (debuntu) package: name={{ item }} state=present with_items: - php{{ php_version }}-gd @@ -44,7 +44,7 @@ - php{{ php_version }}-mcrypt when: is_debuntu -- name: Install list of packages +- name: Install list of packages (redhat) package: name={{ item }} state=present with_items: - php @@ -58,14 +58,14 @@ # - php-imagick when: is_redhat -- name: Copy it to permanent location /opt +- name: Copy it to permanent location /opt (OS's other than Fedora 18) unarchive: src={{ downloads_dir }}/{{ nextcloud_src_file }} dest={{ nextcloud_prefix }} creates={{ nextcloud_prefix }}/nextcloud/version.php when: not is_F18 # ansible 1.4.1 does not have "creates" -- name: Copy it to permanent location /opt +- name: Copy it to permanent location /opt (Fedora 18) unarchive: src={{ downloads_dir }}/{{ nextcloud_src_file }} dest={{ nextcloud_prefix }} when: is_F18 @@ -75,7 +75,7 @@ state=directory when: is_centos -- name: Add autoconfig file +- name: Add autoconfig file (CentOS) template: src=autoconfig.php.j2 dest={{ nextcloud_prefix }}/nextcloud/config/autoconfig.php owner={{ apache_user }} @@ -120,7 +120,7 @@ # Enable nextcloud by copying template to httpd config # following enables and disables -- include: nextcloud_enabled.yml +- include_tasks: nextcloud_enabled.yml - name: Add Nextcloud to service list ini_file: dest='{{ service_filelist }}'