From 9273681092e69ca9651bd4e33db7df0e7a12b1cd Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sun, 24 Dec 2017 18:12:40 +0300
Subject: [PATCH] Move user-level environment variables

---
 ansible/roles/blocks/owner/tasks/main.yml    | 15 +++++++++++++--
 ansible/roles/blocks/owner/templates/envs.j2 |  3 +++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ansible/roles/blocks/owner/templates/envs.j2

diff --git a/ansible/roles/blocks/owner/tasks/main.yml b/ansible/roles/blocks/owner/tasks/main.yml
index 245d6c3..7632e9b 100644
--- a/ansible/roles/blocks/owner/tasks/main.yml
+++ b/ansible/roles/blocks/owner/tasks/main.yml
@@ -23,8 +23,19 @@
   with_items: '{{ owner_ssh_keys }}'
 
 - name: 'Set up environment variables for {{ owner_name }}.'
+  template:
+    src: envs.j2
+    dest: '/home/{{ owner_name }}/.envs'
+
+- name: 'Remove environment variables for {{ owner_name }} from bashrc.'
   lineinfile:
-    dest: '/home/{{ owner_name }}/.bashrc'
+    path: '/home/{{ owner_name }}/.bashrc'
     regexp: '^export {{ item.key }}='
-    line: 'export {{ item.key }}="{{ item.value }}"'
+    state: absent
   with_dict: '{{ owner_envs }}'
+
+- name: 'Include environment variables for {{ owner_name }} in bashrc.'
+  lineinfile:
+    path: '/home/{{ owner_name }}/.bashrc'
+    regexp: '^\. ~\/\.envs'
+    line: '. ~/.envs'
diff --git a/ansible/roles/blocks/owner/templates/envs.j2 b/ansible/roles/blocks/owner/templates/envs.j2
new file mode 100644
index 0000000..cc8d14a
--- /dev/null
+++ b/ansible/roles/blocks/owner/templates/envs.j2
@@ -0,0 +1,3 @@
+{% for name, value in owner_envs.iteritems() %}
+export {{ name }}={{ value }}
+{% endfor %}