From 74d76cdf15af4c01211935b88d0b39409af941a2 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Thu, 10 Dec 2020 11:30:08 +0100
Subject: [PATCH] Fixed use of incorect var for OS detection

---
 CoreModules/apache/conf.sh     | 2 +-
 CoreModules/apache/preconf.sh  | 2 +-
 CoreModules/generic/preconf.sh | 2 +-
 Scripts/GeneratePhplist.sh     | 2 +-
 SubModules/php-fpm/preconf.sh  | 2 +-
 SubModules/postfix/preconf.sh  | 2 +-
 SubModules/redis/preconf.sh    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh
index 3a63066..a46ec9b 100644
--- a/CoreModules/apache/conf.sh
+++ b/CoreModules/apache/conf.sh
@@ -4,7 +4,7 @@ systemctl stop $apacheService > $OUTPUT 2>&1
 #   Apache   #
 ##############
 
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 	a2dissite 000-default > $OUTPUT 2>&1
 	a2dismod mpm_prefork > $OUTPUT 2>&1
 	a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb > $OUTPUT 2>&1
diff --git a/CoreModules/apache/preconf.sh b/CoreModules/apache/preconf.sh
index f6641db..87a4508 100644
--- a/CoreModules/apache/preconf.sh
+++ b/CoreModules/apache/preconf.sh
@@ -1,4 +1,4 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 # Debian/Ubunbtu apache variables
     apacheConfDir=/etc/apache2
     apacheService=apache2
diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index 1f2e951..24fc427 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -1,4 +1,4 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 ########################
 #    Debian/Ubunbtu    #
 ########################
diff --git a/Scripts/GeneratePhplist.sh b/Scripts/GeneratePhplist.sh
index b31f088..1a007a1 100644
--- a/Scripts/GeneratePhplist.sh
+++ b/Scripts/GeneratePhplist.sh
@@ -1,6 +1,6 @@
 if [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi
 
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 # Debian/Ubunbtu Php variables
     phpPoolDir=/etc/php/${phpver}/fpm/pool.d
     phpPkgName=php${phpver}
diff --git a/SubModules/php-fpm/preconf.sh b/SubModules/php-fpm/preconf.sh
index db90f43..1085b2b 100644
--- a/SubModules/php-fpm/preconf.sh
+++ b/SubModules/php-fpm/preconf.sh
@@ -1,4 +1,4 @@
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 # Debian/Ubunbtu Php variables
     phpPoolDir=/etc/php/${phpver}/fpm/pool.d
     phpPkgName=php${phpver}
diff --git a/SubModules/postfix/preconf.sh b/SubModules/postfix/preconf.sh
index 44f531b..1d01d0c 100644
--- a/SubModules/postfix/preconf.sh
+++ b/SubModules/postfix/preconf.sh
@@ -7,7 +7,7 @@ if [ -z "${domain}" ]; then
     fi
 fi
 
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
     debconf-set-selections <<< "postfix postfix/mailname string $domain"
     debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"
 fi
\ No newline at end of file
diff --git a/SubModules/redis/preconf.sh b/SubModules/redis/preconf.sh
index a94f95a..8dec08d 100644
--- a/SubModules/redis/preconf.sh
+++ b/SubModules/redis/preconf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
 # Debian/Ubunbtu redis variables
     redisService=redis-server