Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Main:* fix for CMSHooks, Mod:Postfix fix openDKIM

Browse Source 
Main:Inst Fixed failing to store storing EnabledAons/aonoption

Main:AddCMS renamed option to EnOption to avoid resusing variable

Mod:Postfix Fixed OpenDKIM usermod
This commit is contained in:
Bram Prieshof
2021-02-11 15:18:17 +01:00
parent 064ceafe08
commit 638a8c1525
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AppendCMS.sh
View File

@@ -37,8 +37,8 @@ declare -n options="$webserv"Options
##----------------## ##----------------##
#Options var setup for enabled sub-modules #Options var setup for enabled sub-modules
option="${SelectedOptions,,}" && option="${option// /}" && option="${option//:/ }" && option="${option//'"'}" EnOption="${SelectedOptions[@],,}" && EnOption="${EnOption// /}" && EnOption="${EnOption//:/ }" && EnOption="${EnOption//'"'}"
option="$option""$EnabledAons" EnOption="$EnOption""${EnabledAons[@]}"
##---------------## ##---------------##
# Functions # # Functions #
@@ -163,7 +163,7 @@ if [ $IMODE = l ]; then
done done
fi fi
#Cleaning options from menu #Cleaning CMS from menu
CMS="${CMS//:}" && CMS="${CMS,,}" CMS="${CMS//:}" && CMS="${CMS,,}"
##-----------------## ##-----------------##
@@ -216,7 +216,7 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
fi fi
#Preconfiguring module For CMS #Preconfiguring module For CMS
for val1 in ${option[*]}; do for val1 in ${EnOption[*]}; do
modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1") modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
#Checking #Checking
if test -z "$modListed" if test -z "$modListed"
@@ -296,7 +296,7 @@ fi
#Configuring Module for CMS #Configuring Module for CMS
for val1 in ${option[*]}; do for val1 in ${EnOption[*]}; do
modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1") modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
#Checking #Checking
if test -z "$modListed" if test -z "$modListed"

2
SubModules/postfix/conf.sh
View File

@@ -36,7 +36,7 @@ EOF
# OpenDKIM # # OpenDKIM #
##--------------## ##--------------##
usermod –a –G opendkim postfix usermod -aG opendkim postfix
rm -rf /etc/opendkim.d rm -rf /etc/opendkim.d
mkdir -p /etc/opendkim.d/keys mkdir -p /etc/opendkim.d/keys
chown opendkim:opendkim /etc/opendkim.d/keys -R chown opendkim:opendkim /etc/opendkim.d/keys -R

2
installer.sh
View File

@@ -442,7 +442,7 @@ if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$re
fi fi
#saving enabled Allways on modules #saving enabled Allways on modules
echo 'EnabledAons=('$aonoption')' > /etc/ICTM/selopts.list echo 'EnabledAons=('$aonoption')' >> /etc/ICTM/selopts.list
#Combining selected option with always-on options #Combining selected option with always-on options
option="$option""$aonoption" option="$option""$aonoption"