From owner-svn-ports-all@freebsd.org Fri May 31 11:55:41 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2C0315BABF7; Fri, 31 May 2019 11:55:41 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 44CCC69C8B; Fri, 31 May 2019 11:55:41 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A4CA27F06; Fri, 31 May 2019 11:55:41 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4VBtec8081296; Fri, 31 May 2019 11:55:40 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4VBteoY081295; Fri, 31 May 2019 11:55:40 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201905311155.x4VBteoY081295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Fri, 31 May 2019 11:55:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503168 - in head/security/py-fail2ban: . files X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/security/py-fail2ban: . files X-SVN-Commit-Revision: 503168 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 44CCC69C8B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 May 2019 11:55:41 -0000 Author: koobs Date: Fri May 31 11:55:40 2019 New Revision: 503168 URL: https://svnweb.freebsd.org/changeset/ports/503168 Log: security/py-fail2ban: Fix rc script The rc.d script evaluates fail2ban_pidfile before rc.conf is read. This change moves those evaluations to the corect place allowing users to override the values via /etc/rc.conf as expected. PR: 236017 Reported by: , Dmitry Wagin Submitted by: (maintainer) MFH: 2019Q2 Modified: head/security/py-fail2ban/Makefile head/security/py-fail2ban/files/fail2ban.in Modified: head/security/py-fail2ban/Makefile ============================================================================== --- head/security/py-fail2ban/Makefile Fri May 31 11:49:20 2019 (r503167) +++ head/security/py-fail2ban/Makefile Fri May 31 11:55:40 2019 (r503168) @@ -2,6 +2,7 @@ PORTNAME= fail2ban PORTVERSION= 0.10.4 +PORTREVISION= 1 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/security/py-fail2ban/files/fail2ban.in ============================================================================== --- head/security/py-fail2ban/files/fail2ban.in Fri May 31 11:49:20 2019 (r503167) +++ head/security/py-fail2ban/files/fail2ban.in Fri May 31 11:55:40 2019 (r503168) @@ -8,14 +8,10 @@ # fail2ban_enable="YES" # fail2ban_flags="" -fail2ban_enable=${fail2ban_enable-"NO"} -fail2ban_pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"} - . /etc/rc.subr name="fail2ban" rcvar=fail2ban_enable -pidfile="${fail2ban_pidfile}" command="%%PREFIX%%/bin/fail2ban-server" command_interpreter="%%PYTHON_CMD%%" @@ -24,6 +20,14 @@ client="%%PREFIX%%/bin/fail2ban-client" extra_commands="reload jailstatus" load_rc_config ${name} + +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# SET THEM IN THE /etc/rc.conf FILE +# + +fail2ban_enable=${fail2ban_enable-"NO"} +pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"} start_cmd="${client} ${fail2ban_flags} start" stop_cmd="${client} ${fail2ban_flags} stop"