svn commit: r465090 - in head/textproc: elasticsearch5 elasticsearch5/files elasticsearch6 elasticsearch6/files

[Mark Felder]

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
 }