Extract environment building tasks from the JSON template

[github/fretlink/ansible-clever.git] / tasks / environment.yml

diff --git a/tasks/environment.yml b/tasks/environment.yml
index 3d1ddbf94ad80acd1c9f84157bee869d2fcb8a57..60b31d2b730cf5674388a7e2c586bbc9c5143f5e 100644 (file)
--- a/tasks/environment.yml
+++ b/tasks/environment.yml
@@ -1,10 +1,20 @@
+- name: Setup haskell-specific environment variables
+  set_fact:
+    clever_haskell_env:
+      CC_RUN_COMMAND: "~/.local/bin/{{ clever_haskell_entry_point }}"
+  when: clever_haskell_entry_point is defined
+
+- name: Assemble full environment
+  set_fact:
+    clever_env: "{{ clever_base_env | combine(clever_haskell_env) | combine(clever_env) }}"
+
 - name: Create environment file
   template:
     src: env.j2
     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 }}"