From 574e61b085cbdb88b7b421dc70894cdb754b18fb Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 4 Dec 2020 11:10:57 +0100
Subject: [PATCH] Updated Redis module for Centos compatibility

---
 SubModules/redis/apt.pkg.list     |  1 +
 SubModules/redis/conf.sh          |  2 +-
 SubModules/redis/dnf.pkg.list     |  1 +
 SubModules/redis/generic.pkg.list |  2 +-
 SubModules/redis/preconf.sh       | 10 ++++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 SubModules/redis/apt.pkg.list
 create mode 100644 SubModules/redis/dnf.pkg.list

diff --git a/SubModules/redis/apt.pkg.list b/SubModules/redis/apt.pkg.list
new file mode 100644
index 0000000..b523829
--- /dev/null
+++ b/SubModules/redis/apt.pkg.list
@@ -0,0 +1 @@
+redis-server 
\ No newline at end of file
diff --git a/SubModules/redis/conf.sh b/SubModules/redis/conf.sh
index 03a2a17..f284ba4 100644
--- a/SubModules/redis/conf.sh
+++ b/SubModules/redis/conf.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-systemctl enable --now redis-server
\ No newline at end of file
+systemctl enable --now $redisService
\ No newline at end of file
diff --git a/SubModules/redis/dnf.pkg.list b/SubModules/redis/dnf.pkg.list
new file mode 100644
index 0000000..74b362f
--- /dev/null
+++ b/SubModules/redis/dnf.pkg.list
@@ -0,0 +1 @@
+redis
\ No newline at end of file
diff --git a/SubModules/redis/generic.pkg.list b/SubModules/redis/generic.pkg.list
index 61097ca..14863bb 100644
--- a/SubModules/redis/generic.pkg.list
+++ b/SubModules/redis/generic.pkg.list
@@ -1 +1 @@
-redis-server PHPprefix-redis
\ No newline at end of file
+PHPprefix-redis
\ No newline at end of file
diff --git a/SubModules/redis/preconf.sh b/SubModules/redis/preconf.sh
index 85dceb4..f868b2d 100644
--- a/SubModules/redis/preconf.sh
+++ b/SubModules/redis/preconf.sh
@@ -1,3 +1,13 @@
 #!/bin/bash
 
+if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+# Debian/Ubunbtu redis variables
+    redisService=redis-server
+
+elif [ "$shortdist" = "cent8" ]; then
+# Centos redis variable
+    redisService=redis
+fi
+
+
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=redis osrel=$shortdist bash > $OUTPUT 2>&1
\ No newline at end of file