Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for other mta before installing sendmail

Browse Source
This commit is contained in:
VirtuBox
2019-09-26 11:13:35 +02:00
parent 077a4a0621
commit c7e2f797d1
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- [SECURITY] Additional Nginx directives to prevent access to log files or backup from web browser - [SECURITY] Additional Nginx directives to prevent access to log files or backup from web browser
- [CORE] apt-mirror-updater to select the fastest debian/ubuntu mirror with automatic switching between mirrors if the current mirror is being updated - [CORE] apt-mirror-updater to select the fastest debian/ubuntu mirror with automatic switching between mirrors if the current mirror is being updated
- [SITE] add `--force` to force Let's Encrypt certificate issuance even if DNS check fail - [SITE] add `--force` to force Let's Encrypt certificate issuance even if DNS check fail
- [STACK] check if another mta is installed before installing sendmail
#### Changed #### Changed

11
wo/cli/plugins/stack.py
View File

@@ -265,11 +265,16 @@ class WOStackController(CementBaseController):
# sendmail # sendmail
if pargs.sendmail: if pargs.sendmail:
Log.debug(self, "Setting apt_packages variable for Sendmail") Log.debug(self, "Setting apt_packages variable for Sendmail")
if not WOAptGet.is_installed(self, 'sendmail'): if (not WOAptGet.is_installed(self, 'sendmail') and
not WOAptGet.is_installed(self, 'postfix')):
apt_packages = apt_packages + ["sendmail"] apt_packages = apt_packages + ["sendmail"]
else: else:
Log.debug(self, "Sendmail already installed") if WOAptGet.is_installed(self, 'sendmail'):
Log.info(self, "Sendmail already installed") Log.debug(self, "Sendmail already installed")
Log.info(self, "Sendmail already installed")
else:
Log.debug(self, "Another mta is already installed")
Log.info(self, "Another mta is already installed")
# proftpd # proftpd
if pargs.proftpd: if pargs.proftpd: