From cba4fbe067627285cab8a2f7028ffdfd032dd045 Mon Sep 17 00:00:00 2001
From: streambinder <posta@davidepucci.it>
Date: Mon, 18 Jan 2021 14:06:36 +0100
Subject: [PATCH 1/2] fix(debian): install/configure sentinel on stretch/buster

---
 redis/osfingermap.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/redis/osfingermap.yaml b/redis/osfingermap.yaml
index 95c5f10..2b4a6a6 100644
--- a/redis/osfingermap.yaml
+++ b/redis/osfingermap.yaml
@@ -1,6 +1,14 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+Debian-10:
+  sentinel_pkg: redis-sentinel
+  sentinel:
+    pidfile: /run/sentinel/redis-sentinel.pid
+Debian-9:
+  sentinel_pkg: redis-sentinel
+  sentinel:
+    pidfile: /run/sentinel/redis-sentinel.pid
 Debian-7:
   cfg_version: '2.4'
 Ubuntu-16.04:

From a4a5d3cf1639659822d657bc3137b5600ab2a2fd Mon Sep 17 00:00:00 2001
From: streambinder <posta@davidepucci.it>
Date: Thu, 11 Feb 2021 12:36:51 +0100
Subject: [PATCH 2/2] fix(debian): optimize code for deletion

---
 redis/osfamilymap.yaml |  4 +++-
 redis/osfingermap.yaml | 19 ++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/redis/osfamilymap.yaml b/redis/osfamilymap.yaml
index c94c187..b3f5d0a 100644
--- a/redis/osfamilymap.yaml
+++ b/redis/osfamilymap.yaml
@@ -7,10 +7,12 @@ Debian:
   svc_name: redis-server
   logfile: /var/log/redis/redis-server.log
   pidfile: /var/run/redis/redis-server.pid
-  sentinel_pkg: redis-server
+  sentinel_pkg: redis-sentinel
   sentinel_service: redis-sentinel
   sentinel_cfg: /etc/redis/sentinel.conf
   sentinel_logfile: /var/log/redis/redis-sentinel.log
+  sentinel:
+    pidfile: /run/sentinel/redis-sentinel.pid
 RedHat:
   pkg_name: redis
   python_dev_package: python-devel
diff --git a/redis/osfingermap.yaml b/redis/osfingermap.yaml
index 2b4a6a6..afdadaf 100644
--- a/redis/osfingermap.yaml
+++ b/redis/osfingermap.yaml
@@ -1,24 +1,21 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-Debian-10:
-  sentinel_pkg: redis-sentinel
-  sentinel:
-    pidfile: /run/sentinel/redis-sentinel.pid
-Debian-9:
-  sentinel_pkg: redis-sentinel
+Debian-8: &debian-old
+  sentinel_pkg: redis-server
   sentinel:
-    pidfile: /run/sentinel/redis-sentinel.pid
+    pidfile: /var/run/redis/sentinel.pid
 Debian-7:
-  cfg_version: '2.4'
+  <<: *debian-old
+  cfg_version: "2.4"
 Ubuntu-16.04:
-  cfg_version: '3.0'
+  cfg_version: "3.0"
   sentinel_pkg: redis-sentinel
 CentOS Linux-7:
-  cfg_version: '3.2'
+  cfg_version: "3.2"
   sentinel:
     group: root
-    daemonize: 'no'
+    daemonize: "no"
 CentOS-6:
   sentinel:
     group: root