Index: head/textproc/elasticsearch2/Makefile =================================================================== --- head/textproc/elasticsearch2/Makefile (revision 414917) +++ head/textproc/elasticsearch2/Makefile (revision 414918) @@ -1,87 +1,88 @@ # Created by: Tom Judge # $FreeBSD$ PORTNAME= elasticsearch PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ PKGNAMESUFFIX= 2 MAINTAINER= tj@FreeBSD.org COMMENT= Full-text search engine for Java LICENSE= APACHE20 CONFLICTS= elasticsearch-[0-9]* USES= cpe NO_ARCH= yes USE_JAVA= yes NO_BUILD= yes JAVA_VERSION= 1.7+ USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS .include LUCENEVER= 5.5.0 CONFIG_FILES= elasticsearch.yml logging.yml BINS= elasticsearch.in.sh \ elasticsearch \ plugin DOCS= LICENSE.txt \ NOTICE.txt \ README.textile SIGAR_ARCH= ${ARCH:S|i386|x86|} SEARCHUSER?= elasticsearch SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} ELASTIC_DBDIR= /var/db/elasticsearch ELASTIC_LOGDIR= /var/log/elasticsearch SUB_LIST= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ PORTVERSION=${PORTVERSION} SUB_FILES= pkg-message PLIST_SUB= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ LUCENEVER=${LUCENEVER} \ PORTVERSION=${PORTVERSION} \ ELASTIC_DBDIR=${ELASTIC_DBDIR} \ ELASTIC_LOGDIR=${ELASTIC_LOGDIR} post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch .for f in ${CONFIG_FILES} ${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin .for f in ${BINS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch @${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR} cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/textproc/elasticsearch2/files/elasticsearch.in =================================================================== --- head/textproc/elasticsearch2/files/elasticsearch.in (revision 414917) +++ head/textproc/elasticsearch2/files/elasticsearch.in (revision 414918) @@ -1,128 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: elasticsearch # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable elasticsearch: # # elasticsearch_enable="YES" # # elasticsearch_user (username): Set to elasticsearch by default. # Set it to required username. # elasticsearch_group (group): Set to elasticsearch by default. # Set it to required group. # elasticsearch_config (path): Set to /usr/local/etc/elasticsearch/elasticsearch.yml by default. # Set it to the config file location. # elasticsearch_min_mem (num): Minumum JVM heap size, 256m by default. # elasticsearch_max_mem (num): Maximum JVM heap size, 1g by default. # elasticsearch_props (args): Additional java properties or arguments. # elasticsearch_tmp (path): Set to /var/tmp/elasticsearch by default. # Set it to the path to be used for temp files. # . /etc/rc.subr name=elasticsearch rcvar=elasticsearch_enable load_rc_config ${name} : ${elasticsearch_enable:="NO"} : ${elasticsearch_user:=%%SEARCHUSER%%} : ${elasticsearch_group:=%%SEARCHGROUP%%} : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"} : ${elasticsearch_tmp:="/var/tmp/elasticsearch"} required_files="${elasticsearch_config}/elasticsearch.yml" -pidfile="/var/run/${name}.pid" +_pidprefix="/var/run/elasticsearch" +pidfile="${_pidprefix}.pid" extra_commands="console status" console_cmd="elasticsearch_console" start_precmd="elasticsearch_precmd" status_cmd="elasticsearch_status" stop_cmd="elasticsearch_stop" command="%%PREFIX%%/lib/elasticsearch/bin/elasticsearch" command_args="-d --pidfile=${pidfile}" elasticsearch_precmd() { - rc_pid=$(elasticsearch_check_pidfile $pidfile) - - if [ -n "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} is already running: $rc_pid." - return 1 - fi - touch ${pidfile} - chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch + touch ${pidfile} + chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch } - elasticsearch_console() { - rc_pid=$(elasticsearch_check_pidfile $pidfile) - - if [ -n "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} is already running: $rc_pid." - return 1 - fi - - command_args="" - run_rc_command "start" + command_args="" + run_rc_command "start" } elasticsearch_stop() { - rc_pid=$(elasticsearch_check_pidfile $pidfile) + rc_pid=$(elasticsearch_check_pidfile $pidfile) - if [ -z "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} not running? (check $pidfile)." - return 1 - fi + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} not running? (check $pidfile)." + return 1 + fi - echo "Stopping ${name}." - kill ${rc_pid} 2> /dev/null + echo "Stopping ${name}." + kill ${rc_pid} 2> /dev/null } elasticsearch_status() { - rc_pid=$(elasticsearch_check_pidfile $pidfile) + rc_pid=$(elasticsearch_check_pidfile $pidfile) - if [ -z "$rc_pid" ]; then - [ -n "$rc_fast" ] && return 0 - echo "${name} not running? (check $pidfile)." - return 1 - fi - echo "${name} is running as pid ${rc_pid}." + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} not running? (check $pidfile)." + return 1 + fi + echo "${name} is running as pid ${rc_pid}." } elasticsearch_check_pidfile() { - _pidfile=$1 - if [ -z "$_pidfile" ]; then - err 3 'USAGE: elasticsearch_check_pidfile pidfile' - fi - if [ ! -f $_pidfile ]; then - debug "pid file ($_pidfile): not readable." - return - fi - read _pid _junk < $_pidfile - if [ -z "$_pid" ]; then - debug "pid file ($_pidfile): no pid in file." - return - fi - if [ -n "`/usr/bin/su -m ${elasticsearch_user} -c '%%LOCALBASE%%/bin/jps -l' | grep -e "^$_pid"`" ]; then - echo -n $_pid - fi + _pidfile=$1 + if [ -z "$_pidfile" ]; then + err 3 'USAGE: elasticsearch_check_pidfile pidfile' + fi + if [ ! -f $_pidfile ]; then + debug "pid file ($_pidfile): not readable." + return + fi + read _pid _junk < $_pidfile + if [ -z "$_pid" ]; then + debug "pid file ($_pidfile): no pid in file." + return + fi + if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then + echo -n $_pid + fi } +if [ -n "$2" ]; then + profile="$2" + if [ "x${elasticsearch_profiles}" != "x" ]; then + pidfile="${_pidprefix}.${profile}.pid" + eval elasticsearch_config="\${elasticsearch_${profile}_config:-}" + if [ "x${elasticsearch_config}" = "x" ]; then + echo "You must define a configuration (elasticsearch_${profile}_config)" + exit 1 + fi + required_files="${elasticsearch_config}/elasticsearch.yml" + eval elasticsearch_enable="\${elasticsearch_${profile}_enable:-${elasticsearch_enable}}" + eval elasticsearch_props="\${elasticsearch_${profile}_props:-${elasticsearch_props}}" + eval elasticsearch_min_mem="\${elasticsearch_${profile}_min_mem:-${elasticsearch_min_mem}}" + eval elasticsearch_max_mem="\${elasticsearchlimits_${profile}_enable:-${elasticsearch_max_mem}}" + eval elasticsearch_tmp="\${elasticsearchlimits_${profile}_args:-${elasticsearch_tmp}}" + else + echo "$0: extra argument ignored" + fi +else + eval elasticsearch_envvars=${envvars} + if [ "x${elasticsearch_profiles}" != "x" -a "x$1" != "x" ]; then + for profile in ${elasticsearch_profiles}; do + eval _enable="\${elasticsearch_${profile}_enable}" + case "x${_enable:-${elasticsearch_enable}}" in + x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) + continue + ;; + x[Yy][Ee][Ss]) + ;; + *) + if test -z "$_enable"; then + _var=elasticsearch_enable + else + _var=elasticsearch_"${profile}"_enable + fi + echo "Bad value" \ + "'${_enable:-${elasticsearch_enable}}'" \ + "for ${_var}. " \ + "Profile ${profile} skipped." + continue + ;; + esac + echo "===> elasticsearch profile: ${profile}" + /usr/local/etc/rc.d/elasticsearch $1 ${profile} + retcode="$?" + if [ "0${retcode}" -ne 0 ]; then + failed="${profile} (${retcode}) ${failed:-}" + else + success="${profile} ${success:-}" + fi + done + exit 0 + fi +fi run_rc_command "$1"