Date: Fri, 3 Mar 2017 23:58:02 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435375 - in head: sysutils/graylog sysutils/graylog/files www/graylog-web-interface Message-ID: <201703032358.v23Nw2lG049511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Fri Mar 3 23:58:02 2017 New Revision: 435375 URL: https://svnweb.freebsd.org/changeset/ports/435375 Log: Update graylog to latest version, 2.2.1 PR: 216593 Added: head/sysutils/graylog/files/pkg-message.in (contents, props changed) head/sysutils/graylog/files/server.conf.sample.in - copied, changed from r435374, head/sysutils/graylog/files/graylog.conf.example Deleted: head/sysutils/graylog/files/graylog.conf.example head/www/graylog-web-interface/ Modified: head/sysutils/graylog/Makefile head/sysutils/graylog/distinfo head/sysutils/graylog/files/graylog.in head/sysutils/graylog/pkg-plist Modified: head/sysutils/graylog/Makefile ============================================================================== --- head/sysutils/graylog/Makefile Fri Mar 3 23:44:37 2017 (r435374) +++ head/sysutils/graylog/Makefile Fri Mar 3 23:58:02 2017 (r435375) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= graylog -PORTVERSION= 1.3.3 +PORTVERSION= 2.2.1 CATEGORIES= sysutils java -MASTER_SITES= https://packages.graylog2.org/releases/graylog2-server/ \ - http://packages.graylog2.org/releases/graylog2-server/ +MASTER_SITES= https://packages.graylog2.org/releases/graylog/ \ + http://packages.graylog2.org/releases/graylog/ MAINTAINER= thomas@bartelmess.io COMMENT= Tool for centralized log collection @@ -16,29 +16,33 @@ USES= tar:tgz USE_JAVA= yes JAVA_VERSION= 1.7+ JAVA_EXTRACT= yes +NO_ARCH= yes JAVA_RUN= yes NO_BUILD= yes -GRAYLOG_DIR= ${PREFIX}/${PORTNAME} - USE_RC_SUBR= graylog +SUB_FILES= server.conf.sample pkg-message GRAYLOGUSER?= graylog GRAYLOGGROUP?= ${GRAYLOGUSER} USERS= ${GRAYLOGUSER} GROUPS= ${GRAYLOGGROUP} +GRAYLOG_DATA_DIR= /var/db/graylog SUB_LIST= GRAYLOGUSER=${GRAYLOGUSER} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ - JAVA_HOME=${JAVA_HOME} \ - GRAYLOG_DIR=${GRAYLOG_DIR} \ - ETCDIR=${ETCDIR} + GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} + +PLIST_SUB= GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ + GRAYLOGUSER=${GRAYLOGUSER} \ + GRAYLOGGROUP=${GRAYLOGGROUP} do-install: - ${MKDIR} ${STAGEDIR}${GRAYLOG_DIR} - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${GRAYLOG_DIR} - ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${FILESDIR}/graylog_logging.xml ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/plugin + ${MKDIR} ${STAGEDIR}${ETCDIR}/server + ${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR} + ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin) + ${INSTALL_DATA} ${WRKDIR}/server.conf.sample ${STAGEDIR}${ETCDIR}/server/server.conf.sample .include <bsd.port.mk> Modified: head/sysutils/graylog/distinfo ============================================================================== --- head/sysutils/graylog/distinfo Fri Mar 3 23:44:37 2017 (r435374) +++ head/sysutils/graylog/distinfo Fri Mar 3 23:58:02 2017 (r435375) @@ -1,2 +1,3 @@ -SHA256 (graylog-1.3.3.tgz) = 1e98509376dc22ff1602838cebb49b4732618296acc58063ba34f4a97f667ba0 -SIZE (graylog-1.3.3.tgz) = 70204863 +TIMESTAMP = 1488453914 +SHA256 (graylog-2.2.1.tgz) = c7b322477882880b51e59bdd8d858fe50c59760dffb411d0b4a92f61bd797ca6 +SIZE (graylog-2.2.1.tgz) = 99202584 Modified: head/sysutils/graylog/files/graylog.in ============================================================================== --- head/sysutils/graylog/files/graylog.in Fri Mar 3 23:44:37 2017 (r435374) +++ head/sysutils/graylog/files/graylog.in Fri Mar 3 23:58:02 2017 (r435375) @@ -19,7 +19,7 @@ # Name of the graylog group # # graylog_config (string) -# Default value %%ETCDIR%%/graylog.conf +# Default value %%ETCDIR%%/server/server.conf # Path to the graylog configuration file # # graylog_min_mem (string): @@ -31,20 +31,20 @@ # Maximum JVM heap size # # graylog_dir (string): -# Default value: %%GRAYLOG_DIR%% -# Path the the graylog installation. +# Default value: %%DATADIR%% +# Path to the graylog installation. +# +# graylog_data_dir (string): +# Default vaule: %%GRAYLOG_DATA_DIR%% +# Storage location for the graylog journal # # graylog_run_dir (string): # Default value: /var/graylog -# Path the the graylog run folder. +# Path to the graylog run folder. # -# graylog_java_home (string): -# Default value: %%JAVA_HOME%% -# Root directory of the desired Java SDK. -# -# graylog_log4j_config (string): -# Default value: file://%%ETCDIR%%/graylog_logging.xml -# Path to the log4j configuration file for graylog +# graylog_log_file (string): +# Default value: /var/log/graylog-server.log +# Path to the Graylog Server logfile . /etc/rc.subr @@ -55,13 +55,13 @@ load_rc_config $name : ${graylog_enable:="NO"} : ${graylog_user:="%%GRAYLOGUSER%%"} : ${graylog_group:="%%GRAYLOGGROUP%%"} -: ${graylog_config:="%%ETCDIR%%/${name}.conf"} +: ${graylog_config:="%%ETCDIR%%/server/server.conf"} : ${graylog_min_mem:="256m"} : ${graylog_max_mem:="1g"} -: ${graylog_dir:="%%GRAYLOG_DIR%%"} -: ${graylog_run_dir:="/var/graylog"} -: ${graylog_java_home:="%%JAVA_HOME%%"} -: ${graylog_log4j_config="file://%%ETCDIR%%/graylog_logging.xml"} +: ${graylog_dir:="%%DATADIR%%"} +: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"} +: ${graylog_run_dir:="/var/run/graylog"} +: ${graylog_log_file:="/var/log/graylog-server.log"} java_options=" -Xms${graylog_min_mem} \ @@ -72,25 +72,33 @@ java_options=" -Xms${graylog_min_mem} \ -XX:+CMSConcurrentMTEnabled \ -XX:+CMSClassUnloadingEnabled \ -XX:+UseParNewGC \ - -XX:-OmitStackTraceInFastThrow\ - -Djava.library.path=${graylog_dir}/lib/sigar \ - -Dlog4j.configuration=${graylog_log4j_config}" + -XX:-OmitStackTraceInFastThrow" start_precmd="graylog_precmd" -pidfile=/var/run/${name}.pid -command=/usr/sbin/daemon -procname=`env JAVAVM_DRYRUN=true JAVA_VERSION=1.7+ %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -f 2 -d =` +pidfile="${graylog_run_dir}/${name}.pid" +command=/usr/bin/nohup -command_args="-p $pidfile -f /usr/local/bin/java ${java_options} -jar ${graylog_dir}/graylog.jar server --configfile ${graylog_config} --no-pid-file" +command_args="%%LOCALBASE%%/bin/java -jar ${graylog_dir}/graylog.jar server \ + --configfile \"${graylog_config}\" \ + --pidfile \"${pidfile}\" \ + >> \"${graylog_log_file}\" \ + 2>> \"${graylog_log_file}\" &" graylog_precmd() { - /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog - /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog/server - /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 ${graylog_run_dir} - touch $pidfile - chown ${graylog_user}:${graylog_group} ${pidfile} - cd ${graylog_run_dir} + if [ ! -f "${graylog_config}" ]; then + echo "Configuration file ${graylog_config} not found" + exit 1 + fi + + if [ ! -f "${graylog_log_file}" ]; then + touch "${graylog_log_file}" + chown "${graylog_user}:${graylog_group}" "${graylog_log_file}" + chmod 640 "${graylog_log_file}" + fi + + install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}" + install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}" } run_rc_command "$1" Added: head/sysutils/graylog/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/graylog/files/pkg-message.in Fri Mar 3 23:58:02 2017 (r435375) @@ -0,0 +1,10 @@ +====================================================================== + +Please see %%ETCDIR%% for sample versions of +server.conf + +For GeoIP support you need to install the net/GeoIP port and +configure the path to the GeoIP databases in the Graylog Web Interface + +When running graylog in a jail, you need to set enforce_statfs for the jail. +====================================================================== Copied and modified: head/sysutils/graylog/files/server.conf.sample.in (from r435374, head/sysutils/graylog/files/graylog.conf.example) ============================================================================== --- head/sysutils/graylog/files/graylog.conf.example Fri Mar 3 23:44:37 2017 (r435374, copy source) +++ head/sysutils/graylog/files/server.conf.sample.in Fri Mar 3 23:58:02 2017 (r435375) @@ -30,7 +30,7 @@ root_password_sha2 = #root_timezone = UTC # Set plugin directory here (relative or absolute) -plugin_dir = plugin +plugin_dir = %%DATADIR%%/plugin # REST API listen URI. Must be reachable by other graylog2-server nodes if you run a cluster. rest_listen_uri = http://127.0.0.1:12900/ @@ -247,7 +247,7 @@ message_journal_enabled = true # The directory which will be used to store the message journal. The directory must me exclusively used by Graylog and # must not contain any other files than the ones created by Graylog itself. -message_journal_dir = data/journal +message_journal_dir = %%GRAYLOG_DATA_DIR%%/journal # Journal hold messages before they could be written to Elasticsearch. # For a maximum of 12 hours or 5 GB whichever happens first. @@ -372,5 +372,5 @@ mongodb_threads_allowed_to_block_multipl #enable_metrics_collection = false # Disable the use of SIGAR for collecting system stats -#disable_sigar = false +disable_sigar = true Modified: head/sysutils/graylog/pkg-plist ============================================================================== --- head/sysutils/graylog/pkg-plist Fri Mar 3 23:44:37 2017 (r435374) +++ head/sysutils/graylog/pkg-plist Fri Mar 3 23:58:02 2017 (r435375) @@ -1,3 +1,9 @@ -%%ETCDIR%%/graylog.conf.example -%%ETCDIR%%/graylog_logging.xml -graylog/graylog.jar +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/server/server.conf.sample +%%DATADIR%%/graylog.jar +%%DATADIR%%/plugin/graylog-plugin-anonymous-usage-statistics-2.2.1.jar +%%DATADIR%%/plugin/graylog-plugin-beats-2.2.1.jar +%%DATADIR%%/plugin/graylog-plugin-collector-2.2.1.jar +%%DATADIR%%/plugin/graylog-plugin-enterprise-integration-2.2.1.jar +%%DATADIR%%/plugin/graylog-plugin-map-widget-2.2.1.jar +%%DATADIR%%/plugin/graylog-plugin-pipeline-processor-2.2.1.jar +@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%GRAYLOG_DATA_DIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703032358.v23Nw2lG049511>