Update bashrc and postgres-connection roles

roles/hxr.postgres-connection/defaults/main.yml

@@ -1,4 +1,7 @@
-pgc_user:
-    name: "{{ galaxy_user.name }}"
-    home: "{{ galaxy_user.home }}"
-    group_name: "{{ galaxy_group.name | default(galaxy_group) }}"
+pgc_users:
+  - uname: "{{ galaxy_user.name }}"
+    uhome: "{{ galaxy_user.home }}"
+    gname: "{{ galaxy_group.name | default(galaxy_group) }}"
+    pguser: "{{ postgres_user }}"
+    pgpass: "{{ postgres_pass }}"
+    pgdatabase: galaxy

roles/hxr.postgres-connection/tasks/main.yml

@@ -1,20 +1,16 @@
 ---
-- name: Add env vars in bashrc
-  lineinfile:
-    path: "{{ pgc_user.home }}/.bashrc"
-    regexp: "^export {{ item.var }}"
-    line: "export {{ item.var }}='{{ item.val }}'"
-  with_items:
-    - var: PGUSER
-      val: "{{ postgres_user }}"
-    - var: PGHOST
-      val: "{{ postgres_host }}"
+- name: Get all users
+  getent:
+    database: passwd
+    split: ':'
 
-- name: Copy using the 'content' for inline data
-  copy:
-    content: |
-      {{ postgres_host }}:{{ postgres_port }}:*:{{ postgres_user }}:{{ postgres_pass }}
-    dest: "{{ pgc_user.home }}/.pgpass"
-    mode: 0600
-    owner: "{{ pgc_user.name }}"
-    group: "{{ pgc_user.group_name }}"
+- name: Debug info when user does not exist
+  debug:
+    msg: "INFO: User {{ item.uname }} does not exist"
+  loop: "{{ pgc_users }}"
+  when: (not item.uname in getent_passwd.keys())
+
+- name: Run postgres tasks
+  include_tasks: postgres_tasks.yml
+  loop: "{{ pgc_users }}"
+  when: (item.uname in getent_passwd.keys())

roles/hxr.postgres-connection/tasks/postgres_tasks.yml

@@ -0,0 +1,26 @@
+---
+- name: Add postgres connection configuration
+  block:
+    - name: Add env vars in bashrc
+      lineinfile:
+        path: "{{ item.uhome }}/.bashrc"
+        regexp: "^export {{ task_item.var }}"
+        line: "export {{ task_item.var }}='{{ task_item.val }}'"
+      with_items:
+        - var: PGUSER
+          val: "{{ item.pguser }}"
+        - var: PGHOST
+          val: "{{ postgres_host }}"
+        - var: PGDATABASE
+          val: "{{ item.pgdatabase }}"
+      loop_control:
+        loop_var: task_item
+
+    - name: Copy using the 'content' for inline data
+      copy:
+        content: |
+          {{ postgres_host }}:{{ postgres_port }}:*:{{ item.pguser }}:{{ item.pgpass }}
+        dest: "{{ item.uhome }}/.pgpass"
+        mode: 0600
+        owner: "{{ item.uname }}"
+        group: "{{ item.gname }}"

roles/usegalaxy-eu.bashrc/defaults/main.yml

@@ -0,0 +1,5 @@
+---
+bashrc_users:
+  - uname: "{{ galaxy_user.name }}"
+    uhome: "{{ galaxy_user.home }}"
+    gname: "{{ galaxy_group.name }}"