Systemd module now compatible with both stock and external PostgreSQL

postgresql/tasks/systemd.yml

@@ -2,10 +2,17 @@
 
 - name: Set PGDATA environment variable on CentOS 7
   lineinfile:
-    path: /usr/lib/systemd/system/postgresql-{{ postgresql_version }}.service
+    path: /usr/lib/systemd/system/postgresql.service
+    regexp: '^Environment=PGDATA='
+    line: 'Environment=PGDATA={{path_to_icat}}'
+  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7" and use_distribution_postgresql)
+
+- name: Set PGDATA environment variable on CentOS 7
+  lineinfile:
+    path: /usr/lib/systemd/system/postgresql-{{ external_postgresql_version }}.service
     regexp: '^Environment=PGDATA='
     line: 'Environment=PGDATA={{path_to_icat}}'
-  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7")
+  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7" and not use_distribution_postgresql)
 
 - name: Set PGDATA environment variable on CentOS 8
   lineinfile:
@@ -14,13 +21,21 @@
     line: 'Environment=PGDATA={{path_to_icat}}'
   when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "8")
 
+- name: Start postgresql service on CentOS 7
+  systemd:
+    name: postgresql
+    state: started
+    daemon_reload: yes
+    enabled: yes
+  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7" and use_distribution_postgresql)
+
 - name: Start postgresql-{{ postgresql_version }} service on CentOS 7
   systemd: 
-    name: postgresql-{{ postgresql_version }}
+    name: postgresql-{{ external_postgresql_version }}
     state: started
     daemon_reload: yes
     enabled: yes
-  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7")
+  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7" and not use_distribution_postgresql)
 
 - name: Start postgresql service on CentOS 8
   systemd: