Index: head/sysutils/logstash6/Makefile =================================================================== --- head/sysutils/logstash6/Makefile (revision 463992) +++ head/sysutils/logstash6/Makefile (revision 463993) @@ -1,77 +1,77 @@ # Created by: Daniel Solsona , Guido Falsi # $FreeBSD$ PORTNAME= logstash PORTVERSION= 6.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 6 MAINTAINER= elastic@FreeBSD.org COMMENT= Server-side data ingest and transfomation tool LICENSE= APACHE20 RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash CONFLICTS= logstash-[0-9]* logstash5-[0-9]* USES= cpe shebangfix SHEBANG_FILES= bin/logstash CPE_VENDOR= elasticsearch USE_JAVA= yes JAVA_VERSION= 1.8+ JAVA_RUN= yes NO_BUILD= yes LOGSTASH_DIR= ${PREFIX}/${PORTNAME} USE_RC_SUBR= logstash LOGSTASH_HOME?= ${PREFIX}/${PORTNAME} SUB_LIST= JAVA_HOME=${JAVA_HOME} \ LOGSTASH_HOME=${LOGSTASH_HOME} LOGSTASH_BIN_FILES= logstash LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \ jgem jirb_swing jruby.bash jrubyc rake ri post-patch: ${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml do-install: @${FIND} ${WRKSRC} -name '*.bat' -delete ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR} .for x in ${LOGSTASH_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample .endfor ${RM} -rf ${WRKSRC}/config @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR}) .for x in ${LOGSTASH_BIN_FILES} @${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/${x} .endfor .for x in ${LOGSTASH_JRUBY_BIN_FILES} @${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x} .endfor post-install: ${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST} .for x in ${LOGSTASH_CONF_FILES} ${ECHO} "@sample ${ETCDIR}/${x}.sample" >> ${TMPPLIST} .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir logstash/data" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/build_info" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/cache" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/doc" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/extensions" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/manticore-0.6.1-java/spec/ssl" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/redis-3.3.5/test/db" >> ${TMPPLIST} .include Index: head/sysutils/logstash6/files/logstash.in =================================================================== --- head/sysutils/logstash6/files/logstash.in (revision 463992) +++ head/sysutils/logstash6/files/logstash.in (revision 463993) @@ -1,115 +1,115 @@ #!/bin/sh # Configuration settings for logstash in /etc/rc.conf: # # PROVIDE: logstash # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown # # logstash_enable (bool): # Default value: "NO" # Flag that determines whether Logstash is enabled. # # logstash_home (string): # Default value: "/usr/local/logstash" # Logstash installation directory. # # logstash_config (string): # Default value: /usr/local/etc/${name} # Logstash configuration path. # # logstash_log (bool): # Set to "NO" by default. # Set it to "YES" to enable logstash logging to file # Default output to /var/log/logstash.log # # logstash_log_file (string): # Default value: "${logdir}/${name}.log" # Log file path. # # logstash_java_home (string): # Default value: "/usr/local/openjdk8" # Root directory of the desired Java SDK. # The JAVA_HOME environment variable is set with the contents of this # variable. # # logstash_java_opts (string): # Default value: "" # Options to pass to the Java Virtual Machine. # The JAVA_OPTS environment variable is set with the contents of this # variable. # # logstash_opts (string): # Default value: "" # Additional command line flags for logstash, eg. "-r" # . /etc/rc.subr name=logstash rcvar=logstash_enable load_rc_config ${name} logdir="/var/log" : ${logstash_enable="NO"} : ${logstash_home="%%LOGSTASH_HOME%%"} : ${logstash_config="%%ETCDIR%%"} : ${logstash_log="YES"} : ${logstash_log_dir="${logdir}/${name}"} : ${logstash_java_home="%%JAVA_HOME%%"} : ${logstash_java_opts=""} : ${logstash_opts=""} pidfile=/var/run/${name}/${name}.pid -extra_commands=configtest +extra_commands="configtest reload" start_precmd="logstash_precmd" configtest_cmd=configtest logstash_cmd="${logstash_home}/bin/logstash" procname="${logstash_java_home}/bin/java" logstash_chdir=${logstash_home} logstash_log_options="" if checkyesno logstash_log; then logstash_log_options=" -l ${logstash_log_dir}" fi logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}" JAVA_OPTS="${logstash_java_opts}" JAVA_HOME="${logstash_java_home}" export JAVA_OPTS export JAVA_HOME command="/usr/sbin/daemon" command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}" required_files="${logstash_home} ${logstash_java_home} ${logstash_cmd} ${logstash_config}" # Include /usr/local/bin in path because Logstash startup scripts # assume bash is in path. PATH=/usr/local/bin:$PATH logstash_precmd() { /usr/bin/install -d -o root -g wheel -m 755 ${pidfile%/*} /usr/bin/install -d -o root -g wheel -m 755 ${logstash_log_dir} /usr/bin/install -d -o root -g wheel -m 755 /var/db/logstash /usr/bin/install -d -o root -g wheel -m 755 /var/run/logstash } configtest() { echo "${name} configtest:" echo "WARNING: this does not check validity of Grok patterns!" echo "WARNING: this does not check validity of Grok patterns!" echo "WARNING: this does not check validity of Grok patterns!" ${logstash_cmd} --path.settings ${logstash_config} --config.test_and_exit } run_rc_command "$1"