mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

textproc/elasticsearch{5,6}: Pidfiles should be in a writable subdirectory

Browse Source 
This fixes issues Elastic has with starting/stopping in some situations

PR:		226800
This commit is contained in:
Mark Felder 2018-03-20 16:19:08 +00:00
parent 27aa66d076
commit 397fce9114
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465090
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
textproc/elasticsearch5/Makefile
View File

@ -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/

4
textproc/elasticsearch5/files/elasticsearch.in
View File

@ -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=${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 ${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

2
textproc/elasticsearch6/Makefile
View File

@ -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/

4
textproc/elasticsearch6/files/elasticsearch.in
View File

@ -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
}