Work_Archive/VPS-scripts_Monit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added update var and renamed packagelist

Browse Source
This commit is contained in:
Bram Prieshof
2021-01-08 12:01:39 +01:00
parent fd5a3ea921
commit cf5a6dd71c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
InstallMonitModule.sh
View File

@@ -28,7 +28,7 @@ while true; do
done done
} }
if [ "/etc/ICTM/mainvar.list" ] ; then if [ -f "/etc/ICTM/mainvar.list" ] ; then
source /etc/ICTM/mainvar.list; source /etc/ICTM/mainvar.list;
else else
VarError mainvar "Webserver and php" VarError mainvar "Webserver and php"
@@ -49,7 +49,7 @@ if [ ! -z "$webserv" ]; then
source /etc/ICTM/phpvar.list source /etc/ICTM/phpvar.list
fi fi
if [ $webserv = apache ]; then if [ $webserv = apache ]; then
if [ -f "/etc/ICTM/apachevar.list" ] && ; then if [ -f "/etc/ICTM/apachevar.list" ] ; then
source /etc/ICTM/apachevar.list source /etc/ICTM/apachevar.list
else else
VarError apachevar apache VarError apachevar apache
@@ -67,24 +67,32 @@ dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
echo "Ubuntu 18.04 Detected" echo "Ubuntu 18.04 Detected"
PKGM="$APTMODE" PKGM="$APTMODE"
PKGUC="$PKGM update"
PKGUP="$PKGM upgrade -y"
PKGI="${PKGM} install -y --no-install-recommends" PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt" PKGLIST="apt"
shortdist=ubu1804 shortdist=ubu1804
elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
echo "Ubuntu 20.04 Detected" echo "Ubuntu 20.04 Detected"
PKGM="$APTMODE" PKGM="$APTMODE"
PKGUC="$PKGM update"
PKGUP="$PKGM upgrade -y"
PKGI="${PKGM} install -y --no-install-recommends" PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt" PKGLIST="apt"
shortdist=ubu2004 shortdist=ubu2004
elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
echo "Debian 10 Detected" echo "Debian 10 Detected"
PKGM="$APTMODE" PKGM="$APTMODE"
PKGUC="$PKGM update"
PKGUP="$PKGM upgrade -y"
PKGI="${PKGM} install -y --no-install-recommends" PKGI="${PKGM} install -y --no-install-recommends"
PKGLIST="apt" PKGLIST="apt"
shortdist=deb10 shortdist=deb10
elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
echo "Centos 8 Detected" echo "Centos 8 Detected"
PKGM="dnf" PKGM="dnf"
PKGUC="$PKGM check-update --refresh"
PKGUP="$PKGM update -y"
PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y" PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
PKGLIST="dnf" PKGLIST="dnf"
shortdist=el8 shortdist=el8
@@ -118,7 +126,7 @@ echo "$1"
##--------------------------## ##--------------------------##
msg " Starting installer" 8 78 msg " Starting installer" 8 78
$PKGM update > $OUTPUT 2>&1 $PKGUC > $OUTPUT 2>&1
$PKGI curl > $OUTPUT 2>&1 $PKGI curl > $OUTPUT 2>&1
@@ -139,8 +147,8 @@ fi
msg " Preconfiguring" msg " Preconfiguring"
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 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
$PKGM update $PKGUC
$PKGM upgrade -y $PKGUP
##-------------------## ##-------------------##
@@ -155,8 +163,7 @@ fi
# Installer # # Installer #
##-------------## ##-------------##
$PKGM update $PKGUC
sed -i 's/PHPver/'$phpver'/g' /tmp/pkg.list
cat /tmp/pkg.list | xargs $PKGI cat /tmp/pkg.list | xargs $PKGI

0
pkg.list → generic.pkg.list
View File