4 files changed, 10 insertions, 7 deletions

diff --git a/tasks/addon.yml b/tasks/addon.yml
index cde7a1a..f6a4d14 100644
--- a/tasks/addon.yml
+++ b/tasks/addon.yml
@@ -1,9 +1,9 @@
 - name: Gather addon information for {{ addon.name }}
-  shell: "clever env | grep {{ addon.env_prefix }} | sed -e 's/{{ addon.env_prefix }}_//' -e 's/=/: \"/' -e 's/$/\"/' > .clever-cloud/{{ addon.name }}_env.yml"
+  shell: "clever env | grep {{ addon.env_prefix }} | sed -e 's/{{ addon.env_prefix }}_//' -e 's/=/: \"/' -e 's/$/\"/' > {{ clever_app_confdir }}/{{ addon.name }}_env.yml"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Include addon var for {{ addon.name }}
   include_vars:
-    file: "{{ addon.name }}_env.yml"
+    file: "{{ clever_app_confdir }}/{{ addon.name }}_env.yml"
     name: "{{ addon.name }}"
diff --git a/tasks/environment.yml b/tasks/environment.yml
index 3d1ddbf..1508ad4 100644
--- a/tasks/environment.yml
+++ b/tasks/environment.yml
@@ -4,7 +4,7 @@
     dest: "{{ clever_app_confdir }}/env"
   no_log: true
 
-- name: Create add_ons variable file
+- name: Create addons variable file
   include_tasks: addon.yml
   vars:
     addon: "{{ item }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 539e591..fa23f6c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,9 +18,9 @@
     - clever
     - clever-env
 
-- name: Include specific role
-  include_role: "{{ clever_app_role }}"
-  when: clever_app_role
+- name: Include specific tasks
+  include_tasks: "{{ clever_app_tasks }}"
+  when: clever_app_tasks is defined
   tags:
     - clever
     - clever-specific-role
diff --git a/tasks/setup.yml b/tasks/setup.yml
index 49e91ca..ac9fdcb 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,7 +1,7 @@
 - name: Check if clever command is available in path and version
   command: clever --version
   register: clever_returned_version
-  ignore_error: true
+  ignore_errors: true
 
 - name: Ensure user path exists
   file:
@@ -11,6 +11,8 @@
 - name: Download and install clever cli tools if necessary
   unarchive:
     remote_src: yes
+    extra_opts:
+      - "--strip-components=1"
     src: https://clever-tools.cellar.services.clever-cloud.com/releases/{{ clever_cli_version }}/clever-tools-{{ clever_cli_version }}_linux.tar.gz
     dest: "{{ ansible_env.HOME }}/{{ clever_user_path }}"
   when: clever_returned_version|failed or clever_returned_version.stdout != clever_cli_version
@@ -19,6 +21,7 @@
   copy:
     src: "{{ item }}"
     dest: "{{ ansible_env.HOME }}/{{ clever_user_path }}/{{ item }}"
+    mode: 0755
   with_items:
     - clever-set-domain.sh
     - clever-set-drain.sh