From 7061c4c3fe489ffb4e5d5b4b230bef887e911ca1 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 17 Apr 2020 14:40:53 +0200
Subject: [PATCH] Improve systemd settings for slapd (#933)

---
 data/hooks/conf_regen/06-slapd             | 10 ++++++++++
 data/templates/slapd/systemd-override.conf |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 data/templates/slapd/systemd-override.conf

diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd
index 2fa108baa..9b2c20138 100755
--- a/data/hooks/conf_regen/06-slapd
+++ b/data/hooks/conf_regen/06-slapd
@@ -63,6 +63,9 @@ do_pre_regen() {
   cp -a ldap.conf slapd.conf "$ldap_dir"
   cp -a sudo.schema mailserver.schema yunohost.schema "$schema_dir"
 
+  mkdir -p ${pending_dir}/etc/systemd/system/slapd.service.d/
+  cp systemd-override.conf ${pending_dir}/etc/systemd/system/slapd.service.d/ynh-override.conf
+
   install -D -m 644 slapd.default "${pending_dir}/etc/default/slapd"
 }
 
@@ -83,6 +86,13 @@ do_post_regen() {
   chmod o-rwx /etc/yunohost/certs/yunohost.org/
   chmod -R g+rx /etc/yunohost/certs/yunohost.org/
 
+  # If we changed the systemd ynh-override conf
+  if echo "$regen_conf_files" | sed 's/,/\n/g' | grep -q "^/etc/systemd/system/slapd.service.d/ynh-override.conf$"
+  then
+      systemctl daemon-reload
+      systemctl restart slapd
+  fi
+
   [ -z "$regen_conf_files" ] && exit 0
 
   # check the slapd config file at first
diff --git a/data/templates/slapd/systemd-override.conf b/data/templates/slapd/systemd-override.conf
new file mode 100644
index 000000000..afa821bd4
--- /dev/null
+++ b/data/templates/slapd/systemd-override.conf
@@ -0,0 +1,9 @@
+[Service]
+# Prevent slapd from getting killed by oom reaper as much as possible
+OOMScoreAdjust=-1000
+# If slapd exited (for instance if got killed) the service should not be
+# considered as active anymore...
+RemainAfterExit=no
+# Automatically restart the service if the service gets down
+Restart=always
+RestartSec=3