From owner-svn-ports-all@freebsd.org Tue Mar 20 16:19:10 2018 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 EB3D1F59C6E; Tue, 20 Mar 2018 16:19:09 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93D337A408; Tue, 20 Mar 2018 16:19:09 +0000 (UTC) (envelope-from feld@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 8D29B1F0A3; Tue, 20 Mar 2018 16:19:09 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2KGJ96d009605; Tue, 20 Mar 2018 16:19:09 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2KGJ9RM009601; Tue, 20 Mar 2018 16:19:09 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201803201619.w2KGJ9RM009601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 20 Mar 2018 16:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465090 - in head/textproc: elasticsearch5 elasticsearch5/files elasticsearch6 elasticsearch6/files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/textproc: elasticsearch5 elasticsearch5/files elasticsearch6 elasticsearch6/files X-SVN-Commit-Revision: 465090 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Tue, 20 Mar 2018 16:19:10 -0000 Author: feld Date: Tue Mar 20 16:19:08 2018 New Revision: 465090 URL: https://svnweb.freebsd.org/changeset/ports/465090 Log: textproc/elasticsearch{5,6}: Pidfiles should be in a writable subdirectory This fixes issues Elastic has with starting/stopping in some situations PR: 226800 Modified: head/textproc/elasticsearch5/Makefile head/textproc/elasticsearch5/files/elasticsearch.in head/textproc/elasticsearch6/Makefile head/textproc/elasticsearch6/files/elasticsearch.in Modified: head/textproc/elasticsearch5/Makefile ============================================================================== --- head/textproc/elasticsearch5/Makefile Tue Mar 20 15:33:09 2018 (r465089) +++ head/textproc/elasticsearch5/Makefile Tue Mar 20 16:19:08 2018 (r465090) @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 5.6.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Modified: head/textproc/elasticsearch5/files/elasticsearch.in ============================================================================== --- head/textproc/elasticsearch5/files/elasticsearch.in Tue Mar 20 15:33:09 2018 (r465089) +++ head/textproc/elasticsearch5/files/elasticsearch.in Tue Mar 20 16:19:08 2018 (r465090) @@ -34,7 +34,7 @@ load_rc_config ${name} : ${elasticsearch_tmp=/var/tmp/elasticsearch} required_files="${elasticsearch_config}/elasticsearch.yml" -_pidprefix=/var/run/elasticsearch +_pidprefix=/var/run/elasticsearch/elasticsearch pidfile=${_pidprefix}.pid procname=%%JAVA%% @@ -46,7 +46,7 @@ command_args="-d --pidfile=${pidfile} -Epath.conf=${el elasticsearch_precmd() { - /usr/bin/install -o ${elasticsearch_user} -g ${elasticsearch_group} /dev/null ${pidfile} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${pidfile%/*} /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${elasticsearch_tmp} /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/db/elasticsearch /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch Modified: head/textproc/elasticsearch6/Makefile ============================================================================== --- head/textproc/elasticsearch6/Makefile Tue Mar 20 15:33:09 2018 (r465089) +++ head/textproc/elasticsearch6/Makefile Tue Mar 20 16:19:08 2018 (r465090) @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 6.2.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Modified: head/textproc/elasticsearch6/files/elasticsearch.in ============================================================================== --- head/textproc/elasticsearch6/files/elasticsearch.in Tue Mar 20 15:33:09 2018 (r465089) +++ head/textproc/elasticsearch6/files/elasticsearch.in Tue Mar 20 16:19:08 2018 (r465090) @@ -32,7 +32,7 @@ load_rc_config ${name} : ${elasticsearch_login_class=root} required_files="${elasticsearch_config}/elasticsearch.yml" -_pidprefix=/var/run/elasticsearch +_pidprefix=/var/run/elasticsearch/elasticsearch pidfile=${_pidprefix}.pid procname=%%JAVA%% @@ -46,7 +46,7 @@ export ES_PATH_CONF=${elasticsearch_config} elasticsearch_precmd() { - /usr/bin/install -o ${elasticsearch_user} -g ${elasticsearch_group} /dev/null ${pidfile} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${pidfile%/*} /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/db/elasticsearch /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch }