Merge pull request #64 from clementd-fretlink/json-env

Use JSON import for environment variables

2 files changed, 11 insertions, 1 deletions

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 4d4ecaa..751d78f 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -17,7 +17,7 @@
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Push Environment
-  shell: "clever env import < {{ clever_app_confdir }}/env"
+  shell: "clever env import --json < {{ clever_app_confdir }}/env"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
diff --git a/tasks/environment.yml b/tasks/environment.yml
index 1508ad4..60b31d2 100644
--- a/tasks/environment.yml
+++ b/tasks/environment.yml
@@ -1,3 +1,13 @@
+- 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