Minor Changes
This commit is contained in:
parent
08d2af63ad
commit
b4aa9ae324
2 changed files with 20 additions and 1 deletions
|
@ -1738,9 +1738,10 @@ function installAntiSpam(){
|
||||||
|
|
||||||
# Only keep going if we have the basic packages installed
|
# Only keep going if we have the basic packages installed
|
||||||
AMAVISINS=$(which amavisd-new)
|
AMAVISINS=$(which amavisd-new)
|
||||||
|
AMAVISINSNEW=$(which amavisd)
|
||||||
SPAMASSASSINS=$(which spamassassin)
|
SPAMASSASSINS=$(which spamassassin)
|
||||||
|
|
||||||
if [ ! -z "$AMAVISINS" ] && [ ! -z "$SPAMASSASSINS" ]; then
|
if [[ ! -z "$AMAVISINS" || ! -z "$AMAVISINSNEW" ]] && [ ! -z "$SPAMASSASSINS" ]; then
|
||||||
|
|
||||||
# Add Users
|
# Add Users
|
||||||
adduser clamav amavis
|
adduser clamav amavis
|
||||||
|
@ -3549,6 +3550,15 @@ function installPipPackages(){
|
||||||
pip install mysqlclient
|
pip install mysqlclient
|
||||||
pip install passlib
|
pip install passlib
|
||||||
pip install mysqlclient
|
pip install mysqlclient
|
||||||
|
|
||||||
|
pip2Instance=$(which "pip2")
|
||||||
|
if [ ! -z "$pip2Instance" ]; then
|
||||||
|
pip2 install requests
|
||||||
|
pip2 install chardet
|
||||||
|
pip2 install mysqlclient
|
||||||
|
pip2 install passlib
|
||||||
|
pip2 install mysqlclient
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
###############################
|
###############################
|
||||||
|
|
|
@ -3195,6 +3195,15 @@ function installPipPackages(){
|
||||||
pip install mysqlclient
|
pip install mysqlclient
|
||||||
pip install passlib
|
pip install passlib
|
||||||
pip install mysqlclient
|
pip install mysqlclient
|
||||||
|
|
||||||
|
pip2Instance=$(which "pip2")
|
||||||
|
if [ ! -z "$pip2Instance" ]; then
|
||||||
|
pip2 install requests
|
||||||
|
pip2 install chardet
|
||||||
|
pip2 install mysqlclient
|
||||||
|
pip2 install passlib
|
||||||
|
pip2 install mysqlclient
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
Loading…
Reference in a new issue