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

Fix fail2ban variable

Browse Source
This commit is contained in:
VirtuBox
2019-07-18 17:54:45 +02:00
parent 15dd961cd3
commit 99c6cc8d58
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,29 +1077,28 @@ class WOStackController(CementBaseController):
# create fail2ban configuration files # create fail2ban configuration files
if set(WOVariables.wo_fail2ban).issubset(set(apt_packages)): if set(WOVariables.wo_fail2ban).issubset(set(apt_packages)):
if not os.path.isfile("/etc/fail2ban/jail.d/custom.conf"): if not os.path.isfile("/etc/fail2ban/jail.d/custom.conf"):
data = dict()
Log.debug(self, "Setting up fail2ban jails configuration") Log.debug(self, "Setting up fail2ban jails configuration")
wo_fail2ban = open('/etc/fail2ban/jail.d/custom.conf', fail2ban_config = open('/etc/fail2ban/jail.d/custom.conf',
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
self.app.render((data), 'fail2ban.mustache', self.app.render((data), 'fail2ban.mustache',
out=wo_fail2ban) out=wo_fail2ban)
wo_fail2ban.close() fail2ban_config.close()
Log.debug(self, "Setting up fail2ban wp filter") Log.debug(self, "Setting up fail2ban wp filter")
wo_fail2ban = open('/etc/fail2ban/filter.d/' fail2ban_config = open('/etc/fail2ban/filter.d/'
'wo-wordpress.conf', 'wo-wordpress.conf',
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
self.app.render((data), 'fail2ban-wp.mustache', self.app.render((data), 'fail2ban-wp.mustache',
out=wo_fail2ban) out=wo_fail2ban)
wo_fail2ban.close() fail2ban_config.close()
Log.debug(self, "Setting up fail2ban wp filter") Log.debug(self, "Setting up fail2ban wp filter")
wo_fail2ban = open('/etc/fail2ban/filter.d/' fail2ban_config = open('/etc/fail2ban/filter.d/'
'nginx-forbidden.conf', 'nginx-forbidden.conf',
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
self.app.render((data), 'fail2ban-forbidden.mustache', self.app.render((data), 'fail2ban-forbidden.mustache',
out=wo_fail2ban) out=wo_fail2ban)
wo_fail2ban.close() fail2ban_config.close()
WOGit.add(self, ["/etc/fail2ban"], WOGit.add(self, ["/etc/fail2ban"],
msg="Adding Fail2ban into Git") msg="Adding Fail2ban into Git")
WOService.reload_service(self, 'fail2ban') WOService.reload_service(self, 'fail2ban')

1
wo/cli/plugins/stack_services.py
View File

@@ -85,6 +85,7 @@ class WOStackStatusController(CementBaseController):
if not (self.app.pargs.nginx or self.app.pargs.php or if not (self.app.pargs.nginx or self.app.pargs.php or
self.app.pargs.php73 or self.app.pargs.php73 or
self.app.pargs.mysql or self.app.pargs.mysql or
self.app.pargs.fail2ban or
self.app.pargs.redis): self.app.pargs.redis):
self.app.pargs.nginx = True self.app.pargs.nginx = True
self.app.pargs.php = True self.app.pargs.php = True