From 117f48b4225cd36ff89af4bc8ec2a94b625c4707 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 23 Jan 2020 20:57:14 -0500
Subject: [PATCH] Update postgresql/tasks/main.yml

---
 roles/postgresql/tasks/main.yml | 42 ++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
index 8d30dcc65..62ddc7a32 100644
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@@ -1,30 +1,32 @@
-- name: Install postgresql package
+# TO DO:
+# - validate input vars postgresql_install & postgresql_enabled
+# - put the ~12 stanzas below into install.yml
+#   - when: postgresql_install is defined
+
+- name: Install 'postgresql' package
   package:
     name: postgresql
     state: present
-  #tags: download
 
-- name: Install postgresql-client (debuntu)
+- name: Install 'postgresql-client' package (debuntu)
   package:
     name: postgresql-client
     state: present
   when: is_debuntu | bool
-  #tags: download
 
-- name: Install postgresql-server (OS's other than debuntu)
+- name: Install 'postgresql-server' package (OS's other than debuntu)
   package:
     name: postgresql-server
     state: present
   when: not is_debuntu
-  #tags: download
 
 - name: Install /etc/systemd/system/postgresql-iiab.service from template
   template:
     src: postgresql-iiab.service
     dest: /etc/systemd/system/postgresql-iiab.service
-    owner: root
-    group: root
-    mode: '0644'
+    # owner: root
+    # group: root
+    # mode: '0644'
 
 - name: Create PostgreSQL data dir /library/pgsql-iiab, owned by postgres:postgres
   file:
@@ -71,26 +73,32 @@
     group: postgres
     mode: '0640'
 
-# Probably Not Nec!  Given stanza below does the same.
-- name: 'Stop postgresql service: /etc/init.d/postgresql stop (debuntu)'
-  command: "/etc/init.d/postgresql stop"
-  ignore_errors: True
-  when: postgresql_install and is_debuntu
+# Likely No Longer Nec!  Given stanza below does the same...
+#- name: 'Stop postgresql service: /etc/init.d/postgresql stop (debuntu)'
+#  command: "/etc/init.d/postgresql stop"
+#  ignore_errors: True
+#  when: postgresql_install and is_debuntu
 
-- name: Disable stock postgresql service
+- name: Disable & Stop stock 'postgresql' systemd service
   systemd:
     name: postgresql
     state: stopped
     enabled: no
 
-- name: Enable & Start postgresql-iiab systemd service, if postgresql_enabled
+- name: "Add 'postgresql_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^postgresql_installed'
+    line: 'postgresql_installed: True'
+
+- name: Enable & Start 'postgresql-iiab' systemd service, if 'postgresql_enabled'
   systemd:
     name: postgresql-iiab
     state: started
     enabled: yes
   when: postgresql_enabled | bool
 
-- name: Disable postgresql-iiab service, if not postgresql_enabled
+- name: Disable 'postgresql-iiab' systemd service, if not 'postgresql_enabled'
   systemd:
     name: postgresql-iiab
     state: stopped