From 061d97d5a04ec675b03a8a18accbc77f469f4cd2 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 2 Dec 2020 14:54:22 +0100
Subject: [PATCH] Initial centos test/modifications

---
 CoreModules/generic/preconf.sh | 89 ++++++++++++++++++++++++----------
 installer.sh                   | 12 ++---
 2 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index 10d1add..01433af 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -1,24 +1,78 @@
+if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+########################
+#    Debian/Ubunbtu    #
+########################
+    ##--------------##
+    #  Repositories  #
+    ##--------------##
+
+    curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
+    ##------------##
+    #    System    #
+    ##------------##
+    
+    sed -i -e '/XKBLAYOUT=/c\XKBLAYOUT=us' -e '/XKBVARIANT=/c\XKBVARIANT="intl"' /etc/default/keyboard > $OUTPUT 2>&1
+
+
+    ##-------------##
+    #    Updates    #
+    ##-------------##
+
+    debconf-set-selections <<< 'libssl1.1:amd64 libraries/restart-without-asking boolean true'
+    $PKGM update
+    $PKGM upgrade -y
+
+
+    ##-------------##
+    #    Postfix    #
+    ##-------------##
+
+    #Checking if postfix exists on this system and if so it wil be removed to prevent config conflicts
+    if dpkg-query -Wf'${db:Status-abbrev}' postfix 2>/dev/null | grep -q '^i'; then apt purge -y postfix > $OUTPUT 2>&1; fi
+
+
+elif [ "$osrel" = "cent8" ]; then
+################
+#    Centos    #
+################
+    ##--------------##
+    #  Repositories  #
+    ##--------------##
+
+    curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=epel osrel=$shortdist bash > $OUTPUT 2>&1
+
+    ##------------##
+    #    System    #
+    ##------------##
+
+    localectl set-keymap us-int
+    useradd -r -U -s /usr/sbin/nologin -d /var/www  www-data
+    dnf remove firewalld -y
+
+    ##-------------##
+    #    Postfix    #
+    ##-------------##
+
+    if dnf list installed postfix >/dev/null 2>&1; then dnf remove postfix -y; fi
+    
+fi
+
+
+#################
+#    General    #
+#################
 ##-----------------------##
 #  Prerequisite packages  #
 ##-----------------------##
 
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 
+
 ##--------------##
 #  Repositories  #
 ##--------------##
-
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1
 
-##-------------##
-#    Updates    #
-##-------------##
-
-debconf-set-selections <<< 'libssl1.1:amd64 libraries/restart-without-asking boolean true'
-$PKGM update
-$PKGM upgrade -y
-
 
 ##------------##
 #    System    #
@@ -30,12 +84,6 @@ timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
 sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config > $OUTPUT 2>&1
 
 
-if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
-    sed -i -e '/XKBLAYOUT=/c\XKBLAYOUT=us' -e '/XKBVARIANT=/c\XKBVARIANT="intl"' /etc/default/keyboard > $OUTPUT 2>&1
-elif [ "$osrel" = "cent8" ]; then
-    localectl set-keymap us-int
-fi
-
 ##----------##
 #    Swap    #
 ##----------##
@@ -51,12 +99,3 @@ else
 fi
 echo "vm.swappiness=10" >> /etc/sysctl.conf
 echo "vm.vfs_cache_pressure=50" >> /etc/sysctl.conf
-
-
-##-------------##
-#    Postfix    #
-##-------------##
-
-#Checking if postfix exists on this system and if so it wil be removed to prevent config conflicts
-if dpkg-query -Wf'${db:Status-abbrev}' postfix 2>/dev/null | grep -q '^i'; then apt purge -y postfix > $OUTPUT 2>&1; fi
-
diff --git a/installer.sh b/installer.sh
index 6e6dd76..6e916b6 100644
--- a/installer.sh
+++ b/installer.sh
@@ -24,7 +24,7 @@ fi
 
 #Git-repo
 repo=https://git.ictmaatwerk.com/VPS-scripts/Web-V2
-branch=master
+branch=Centos-Testing
 branchtype=branch #=branch for branch and =tag for release
 #Installer-config
 phpver=7.4
@@ -42,25 +42,21 @@ if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
  PKGLIST="apt"
  shortdist=ubu1804
 elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
- echo "Ubuntu 20.04 is not yet fully tested, not recommended for production server"
  PKGM="$APTMODE"
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=ubu2004 
 elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
- echo "Debian 10 Detected"
  PKGM="$APTMODE"
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=deb10
 elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
- echo "Centos 8 Detected"
  PKGM="dnf"
  PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
  PKGLIST="dnf"
  shortdist=cent8
- echo "This os in not supported"
- exit
+ echo "The support for this os is being worked on"
 else
  echo "This os in not supported"
  exit
@@ -207,7 +203,7 @@ if [[ "$syscheckoff" -ne 1 ]] && [[ ! -z $(dpkg -l | cut -d " " -f 3 | grep "^my
 ##--------------------------##
 
 msg "              Starting installer" 8 78
-$PKGM update > $OUTPUT 2>&1
+$PKGM update -y > $OUTPUT 2>&1
 $PKGI curl wget > $OUTPUT 2>&1
 
 
@@ -578,7 +574,7 @@ done
 #   Installer   #
 ##-------------##
 
-$PKGM update
+$PKGM update -y
 sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
 cat /tmp/pkg.list | xargs $PKGI