From owner-svn-ports-head@freebsd.org Wed Jun 28 09:40:59 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8183FD9D5F2; Wed, 28 Jun 2017 09:40:59 +0000 (UTC) (envelope-from tz@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 mx1.freebsd.org (Postfix) with ESMTPS id 4EEA77223E; Wed, 28 Jun 2017 09:40:59 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5S9ewmj026598; Wed, 28 Jun 2017 09:40:58 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5S9ewuR026596; Wed, 28 Jun 2017 09:40:58 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201706280940.v5S9ewuR026596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 28 Jun 2017 09:40:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444558 - in head/lang: php70/files php71/files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/lang: php70/files php71/files X-SVN-Commit-Revision: 444558 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jun 2017 09:40:59 -0000 Author: tz Date: Wed Jun 28 09:40:58 2017 New Revision: 444558 URL: https://svnweb.freebsd.org/changeset/ports/444558 Log: lang/php70 and lang/php71: Add umask to php-fpm rc script PR: 212911 Submitted by: Robert Kánia Modified: head/lang/php70/files/php-fpm.in head/lang/php71/files/php-fpm.in Modified: head/lang/php70/files/php-fpm.in ============================================================================== --- head/lang/php70/files/php-fpm.in Wed Jun 28 09:18:33 2017 (r444557) +++ head/lang/php70/files/php-fpm.in Wed Jun 28 09:40:58 2017 (r444558) @@ -17,7 +17,7 @@ name="php_fpm" rcvar=php_fpm_enable -start_precmd="php_fpm_checkconfig" +start_precmd="php_fpm_prestart" restart_precmd="php_fpm_checkconfig" reload_precmd="php_fpm_checkconfig" configtest_cmd="php_fpm_checkconfig" @@ -25,6 +25,7 @@ configtest_cmd="php_fpm_checkconfig" load_rc_config "$name" : ${php_fpm_enable="NO"} +: ${php_fpm_umask=""} extra_commands="reload configtest logrotate" @@ -49,6 +50,20 @@ php_fpm_checkconfig() { echo "Performing sanity check on php-fpm configuration:" eval ${command} -t +} + +php_fpm_prestart() +{ + php_fpm_checkconfig + checkconfig=$? + if [ $checkconfig -ne 0 ]; then + return $checkconfig + fi + + if [ ! -z "$php_fpm_umask" ]; then + echo "Setting umask to: ${php_fpm_umask}" + umask $php_fpm_umask + fi } run_rc_command "$1" Modified: head/lang/php71/files/php-fpm.in ============================================================================== --- head/lang/php71/files/php-fpm.in Wed Jun 28 09:18:33 2017 (r444557) +++ head/lang/php71/files/php-fpm.in Wed Jun 28 09:40:58 2017 (r444558) @@ -17,7 +17,7 @@ name="php_fpm" rcvar=php_fpm_enable -start_precmd="php_fpm_checkconfig" +start_precmd="php_fpm_prestart" restart_precmd="php_fpm_checkconfig" reload_precmd="php_fpm_checkconfig" configtest_cmd="php_fpm_checkconfig" @@ -25,6 +25,7 @@ configtest_cmd="php_fpm_checkconfig" load_rc_config "$name" : ${php_fpm_enable="NO"} +: ${php_fpm_umask=""} extra_commands="reload configtest logrotate" @@ -49,6 +50,20 @@ php_fpm_checkconfig() { echo "Performing sanity check on php-fpm configuration:" eval ${command} -t +} + +php_fpm_prestart() +{ + php_fpm_checkconfig + checkconfig=$? + if [ $checkconfig -ne 0 ]; then + return $checkconfig + fi + + if [ ! -z "$php_fpm_umask" ]; then + echo "Setting umask to: ${php_fpm_umask}" + umask $php_fpm_umask + fi } run_rc_command "$1"