5 files changed, 23 insertions, 10 deletions

diff --git a/defaults/main.yml b/defaults/main.yml
index dcf9650..bd3b6a6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,6 +7,7 @@ clever_app_confdir: "{{ clever_app_root }}/.clever_cloud"
 clever_login_file: "{{ clever_app_confdir }}/login"
 
 clever_haskell_entry_point: "{{ clever_entry_point | default(None) }}"
+clever_haskell_env: {}
 clever_env: {}
 
 clever_disable_metrics: false
diff --git a/filter_plugins/env_json_map.py b/filter_plugins/env_json_map.py
new file mode 100644
index 0000000..790dea0
--- /dev/null
+++ b/filter_plugins/env_json_map.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+class FilterModule(object):
+  def filters(self):
+      return {'json_env_map': self.json_env_map}
+
+  def json_env_map(self, env):
+      return [{'name': k, 'value': str(v)} for k,v in env.items()]
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
diff --git a/templates/env.j2 b/templates/env.j2
index 30bda82..59f3050 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -1,9 +1,3 @@
-{% for key, value in (clever_base_env | combine(clever_env)).items() %}
-{{ key }}={{ value | to_json }}
-{% endfor %}
-
-{%- if clever_haskell_entry_point %}
-{# Haskell only #}
-{# https://www.clever-cloud.com/doc/get-help/reference-environment-variables/#haskell #}
-CC_RUN_COMMAND={{'~/.local/bin/' + clever_haskell_entry_point | to_json }}
-{% endif %}
+{# dict2items is not enough here, all the values have to be stringified #}
+{# git-blame this line for more explanations #}
+{{ clever_env | json_env_map | to_json }}