elasticsearch: do not force a specific log service.

This commit is contained in:
Juan RP 2016-01-11 10:50:08 +01:00
parent 48524eb7bf
commit c744624153
3 changed files with 1 additions and 57 deletions

View file

@ -1 +0,0 @@
USERGROUP=elastic:elastic

View file

@ -1,55 +0,0 @@
#!/bin/sh
# Author: TJ Vanderpoel
# Licence: MIT
# This is a generic 'run' script meant to be linked in a log/ directory
# of a runit, daemontools, s6, or similar service.
# It requires svlogd available in the path.
# If the file './conf' exists, it can modify the behavior
# of the svlogd in these ways:
# USERGROUP=user:group (default rsvlog:adm)
# SV_LOGDIR=/path/to/log (default `basename $(dirname $PWD)`)
# CURRENT_LOG_FILE=filename.log (default 'current')
set -e
if [ $0 != "./run" ];then
echo "This script meant to be linked as ./run in a service/log directory only!"
exit 1
fi
curdir=$(basename $(pwd))
if [ "$curdir" != "log" ];then
echo "This script meant to be run from a service/log directory only!"
exit 1
fi
if [ -f ./conf ];then
. ./conf
fi
if [ "x$SV_LOGDIR" != "x" ];then
logdir=$SV_LOGDIR
fi
if [ -w /var/log ];then
user_group=${USERGROUP:-rsvlog:adm}
if [ "x$logdir" = "x" ];then
logdir=$(basename $(dirname $(pwd)))
fi
[ -d "/var/log/$logdir" ] || mkdir -p "/var/log/$logdir"
[ -L ./main ] || [ -d ./main ] || ln -s "/var/log/$logdir" ./main
[ -L ./current ] || ln -s main/current
if [ "x$CURRENT_LOG_FILE" != "x" ];then
[ -L "/var/log/$logdir/$CURRENT_LOG_FILE" ] || ln -s current "/var/log/$logdir/$CURRENT_LOG_FILE"
fi
usergroup=$(stat -c "%U:%G" "/var/log/$logdir")
if [ "$usergroup" != "$user_group" ];then
chown -R $user_group "/var/log/$logdir"
fi
echo Logging as $user_group to /var/log/$logdir
exec chpst -u $user_group svlogd -t ./main
else
echo Logging in $PWD
if [ "x$CURRENT_LOG_FILE" != "x" ];then
[ -L "$CURRENT_LOG_FILE" ] || ln -s current "$CURRENT_LOG_FILE"
fi
exec svlogd -t ./
fi

View file

@ -1,7 +1,7 @@
# Template file for 'elasticsearch' # Template file for 'elasticsearch'
pkgname=elasticsearch pkgname=elasticsearch
version=1.7.3 version=1.7.3
revision=1 revision=2
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
depends="virtual?java-runtime" depends="virtual?java-runtime"
short_desc="A distributed, open source search and analytics engine" short_desc="A distributed, open source search and analytics engine"