From 0a164cf4078eb4bb021cdfabf3feac0703c4b24c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 20:47:48 -0600
Subject: [PATCH] Fixes #23: Postgresql daemon not set correctly on Debian 8/9.

---
 tasks/variables.yml | 10 +++++-----
 vars/Debian-8.yml   |  2 +-
 vars/Debian-9.yml   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/variables.yml b/tasks/variables.yml
index 530990d..df3538b 100644
--- a/tasks/variables.yml
+++ b/tasks/variables.yml
@@ -13,16 +13,16 @@
     postgresql_packages: "{{ __postgresql_packages | list }}"
   when: postgresql_packages is not defined
 
-- name: Define postgresql_daemon.
-  set_fact:
-    postgresql_daemon: "{{ __postgresql_daemon }}"
-  when: postgresql_daemon is not defined
-
 - name: Define postgresql_version.
   set_fact:
     postgresql_version: "{{ __postgresql_version }}"
   when: postgresql_version is not defined
 
+- name: Define postgresql_daemon.
+  set_fact:
+    postgresql_daemon: "{{ __postgresql_daemon }}"
+  when: postgresql_daemon is not defined
+
 - name: Define postgresql_data_dir.
   set_fact:
     postgresql_data_dir: "{{ __postgresql_data_dir }}"
diff --git a/vars/Debian-8.yml b/vars/Debian-8.yml
index f6ad232..ec86f93 100644
--- a/vars/Debian-8.yml
+++ b/vars/Debian-8.yml
@@ -3,7 +3,7 @@ __postgresql_version: "9.4"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
+__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
 __postgresql_packages:
   - postgresql
   - postgresql-contrib
diff --git a/vars/Debian-9.yml b/vars/Debian-9.yml
index 7b57d53..2afb9f4 100644
--- a/vars/Debian-9.yml
+++ b/vars/Debian-9.yml
@@ -3,7 +3,7 @@ __postgresql_version: "9.6"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
+__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
 __postgresql_packages:
   - postgresql
   - postgresql-contrib