github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix scripts-root within `fail2ban.service` (relative install root-base directory). 

This is amend for e3b061e94b.
Closes gh-1964
pull/1970/head
sebres 2017-11-24 12:54:45 +01:00
parent 6db8db04f8
commit eac80966c5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@ -88,7 +88,13 @@ class install_scripts_f2b(install_scripts):
def update_scripts(self, dry_run=False): def update_scripts(self, dry_run=False):
buildroot = os.path.dirname(self.build_dir) buildroot = os.path.dirname(self.build_dir)
print('Creating %s/fail2ban.service (from fail2ban.service.in): @BINDIR@ -> %s' % (buildroot, self.install_dir)) try:
root = self.distribution.command_options['install']['root'][1]
if self.install_dir.startswith(root):
install_dir = self.install_dir[len(root):]
except: # pragma: no cover
print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service".')
print('Creating %s/fail2ban.service (from fail2ban.service.in): @BINDIR@ -> %s' % (buildroot, install_dir))
with open(os.path.join(source_dir, 'files/fail2ban.service.in'), 'r') as fn: with open(os.path.join(source_dir, 'files/fail2ban.service.in'), 'r') as fn:
lines = fn.readlines() lines = fn.readlines()
fn = None fn = None
@ -96,7 +102,7 @@ class install_scripts_f2b(install_scripts):
fn = open(os.path.join(buildroot, 'fail2ban.service'), 'w') fn = open(os.path.join(buildroot, 'fail2ban.service'), 'w')
try: try:
for ln in lines: for ln in lines:
ln = re.sub(r'@BINDIR@', lambda v: self.install_dir, ln) ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln)
if dry_run: if dry_run:
sys.stdout.write(' | ' + ln) sys.stdout.write(' | ' + ln)
continue continue