From 15763754173805bb2cf7edccacfdaa99d14d6344 Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Fri, 8 Jan 2021 14:46:38 +0100
Subject: [PATCH] postgresql: Fix postgresql@.service customization

---
 .../files/postgresql.service.override.conf    |  5 +++++
 postgresql/tasks/config.yml                   | 12 +++++++++---
 postgresql/templates/postgresql.service.j2    | 19 -------------------
 3 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 postgresql/files/postgresql.service.override.conf
 delete mode 100644 postgresql/templates/postgresql.service.j2

diff --git a/postgresql/files/postgresql.service.override.conf b/postgresql/files/postgresql.service.override.conf
new file mode 100644
index 00000000..8e79f883
--- /dev/null
+++ b/postgresql/files/postgresql.service.override.conf
@@ -0,0 +1,5 @@
+[Service]
+OOMScoreAdjust=-1000
+Environment=PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
+Environment=PG_MASTER_OOM_SCORE_ADJ=-1000
+Environment=PG_CHILD_OOM_SCORE_ADJ=0
diff --git a/postgresql/tasks/config.yml b/postgresql/tasks/config.yml
index dc3fc1b1..83b10e25 100644
--- a/postgresql/tasks/config.yml
+++ b/postgresql/tasks/config.yml
@@ -1,8 +1,14 @@
 ---
+- name: Ensure /etc/systemd/system/postgresql.service.d exists
+  file:
+    path: /etc/systemd/system/postgresql@.service.d
+    state: directory
+    recurse: true
+
 - name: Override PostgreSQL systemd unit
-  template:
-    src: postgresql.service.j2
-    dest: /etc/systemd/system/multi-user.target.wants/postgresql.service
+  copy:
+    src: postgresql.service.override.conf
+    dest: /etc/systemd/system/postgresql@.service.d/override.conf
     force: yes
   notify:
     - reload systemd
diff --git a/postgresql/templates/postgresql.service.j2 b/postgresql/templates/postgresql.service.j2
deleted file mode 100644
index b5bd2730..00000000
--- a/postgresql/templates/postgresql.service.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# systemd service for managing all PostgreSQL clusters on the system. This
-# service is actually a systemd target, but we are using a service since
-# targets cannot be reloaded.
-
-[Unit]
-Description=PostgreSQL RDBMS
-
-[Service]
-OOMScoreAdjust=-1000
-Environment=PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
-Environment=PG_MASTER_OOM_SCORE_ADJ=-1000
-Environment=PG_CHILD_OOM_SCORE_ADJ=0
-Type=oneshot
-ExecStart=/bin/true
-ExecReload=/bin/true
-RemainAfterExit=on
-
-[Install]
-WantedBy=multi-user.target