merge changes from v2.3.1

This commit is contained in:
Usman Nasir
2022-06-10 14:42:27 +05:00
3 changed files with 3 additions and 25 deletions

View File

@@ -2068,7 +2068,6 @@ milter_default_action = accept
writeDataToFile.write(line)
writeDataToFile.close()
except IOError as err:
pass
@@ -2320,6 +2319,7 @@ def main():
checks.setupPHPAndComposer()
checks.fix_selinux_issue()
checks.install_psmisc()
checks.fixSudoers()
if args.postfix is None:
checks.install_postfix_dovecot()

View File

@@ -246,6 +246,8 @@ class Upgrade:
for items in data:
if items.find("wheel") > -1 and items.find("ALL=(ALL)"):
continue
elif items.find("root") > -1 and items.find("ALL=(ALL)") > -1 and items[0] != '#':
writeToFile.writelines('root ALL=(ALL:ALL) ALL\n')
else:
writeToFile.writelines(items)

View File

@@ -36,18 +36,6 @@ accesslog $VH_ROOT/logs/$VH_NAME.access_log {
compressArchive 1
}
errorpage 403 {
url 403.html
}
errorpage 404 {
url 404.html
}
errorpage 500 {
url 500.html
}
scripthandler {
add lsapi:{virtualHostUser} php
}
@@ -145,18 +133,6 @@ module cache {
storagePath /usr/local/lsws/cachedata/$VH_NAME
}
errorpage 403 {
url 403.html
}
errorpage 404 {
url 404.html
}
errorpage 500 {
url 500.html
}
scripthandler {
add lsapi:{externalApp} php
}