Date: Wed, 22 May 2019 21:15:41 +0000 (UTC) From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502290 - in head: . sysutils/graylog sysutils/graylog/files Message-ID: <201905222115.x4MLFfVS092711@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dch Date: Wed May 22 21:15:41 2019 New Revision: 502290 URL: https://svnweb.freebsd.org/changeset/ports/502290 Log: sysutils/graylog: update 2.4.6 to 3.0.2 - align file locations to match new upstream config - amend messages and UPDATING to alert users - use upstream sample files for default configuration - MAINTAINER timeout Approved by: jrm (mentor) Differential Revision: https://reviews.freebsd.org/D20021 Deleted: head/sysutils/graylog/files/graylog_logging.xml.in head/sysutils/graylog/files/server.conf.in Modified: head/UPDATING head/sysutils/graylog/Makefile head/sysutils/graylog/distinfo head/sysutils/graylog/files/graylog.in head/sysutils/graylog/files/log4j2.xml.in head/sysutils/graylog/files/pkg-message.in head/sysutils/graylog/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed May 22 21:09:07 2019 (r502289) +++ head/UPDATING Wed May 22 21:15:41 2019 (r502290) @@ -5,6 +5,25 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190522: + AFFECTS: users of sysutils/graylog + AUTHOR: dch@FreeBSD.org + + The port has been updated to the latest stable version 3.0.2, which + includes more plugins by default, but also requires manual changes to + graylog's configuration files, possibly port and URL changes, such as + X-Graylog-Server-URL settings, and elasticsearch must be >= 5. + + The location of configuration files has been amended to align with the + official distribution files and locations. + + After upgrading, manually review and merge changes from your + /usr/local/etc/graylog/server/server.conf into + /usr/local/etc/graylog/graylog.conf + + Consult https://www.graylog.org/post/announcing-graylog-v3-0-ga for + further details. + 20190506: AFFECTS: users of www/gitea AUTHOR: stb@lassitu.de Modified: head/sysutils/graylog/Makefile ============================================================================== --- head/sysutils/graylog/Makefile Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/Makefile Wed May 22 21:15:41 2019 (r502290) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= graylog -DISTVERSION= 2.4.6 +DISTVERSION= 3.0.2 CATEGORIES= sysutils java -MASTER_SITES= https://packages.graylog2.org/releases/graylog/ \ - http://packages.graylog2.org/releases/graylog/ +MASTER_SITES= https://packages.graylog2.org/releases/graylog/ MAINTAINER= thomas@bartelmess.io COMMENT= Tool for centralized log collection @@ -24,7 +23,7 @@ NO_BUILD= yes NO_ARCH= yes USE_RC_SUBR= graylog -SUB_FILES= server.conf log4j2.xml pkg-message graylog_logging.xml +SUB_FILES= log4j2.xml pkg-message GRAYLOGUSER?= graylog GRAYLOGGROUP?= ${GRAYLOGUSER} @@ -38,20 +37,21 @@ SUB_LIST= GRAYLOGUSER=${GRAYLOGUSER} \ GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \ GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} -PLIST_SUB= GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ +PLIST_SUB= DISTVERSION=${DISTVERSION} \ + GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \ GRAYLOGUSER=${GRAYLOGUSER} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ - PORTVERSION=${PORTVERSION} + PORTNAME=${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugin - @${MKDIR} ${STAGEDIR}${ETCDIR}/server + @${MKDIR} ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR} @${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR} ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example ${STAGEDIR}${ETCDIR}/graylog.conf.example cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin - ${INSTALL_DATA} ${WRKDIR}/server.conf ${STAGEDIR}${ETCDIR}/server/server.conf.sample - ${INSTALL_DATA} ${WRKDIR}/log4j2.xml ${STAGEDIR}${ETCDIR}/server/log4j2.xml.sample + ${INSTALL_DATA} ${WRKDIR}/log4j2.xml ${STAGEDIR}${ETCDIR}/log4j2.xml.example .include <bsd.port.mk> Modified: head/sysutils/graylog/distinfo ============================================================================== --- head/sysutils/graylog/distinfo Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/distinfo Wed May 22 21:15:41 2019 (r502290) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542056253 -SHA256 (graylog-2.4.6.tgz) = fcfaf44c3faea8297f340ddc6ed19e5b1fe8f3de3c1b2a1078119565fe2f751d -SIZE (graylog-2.4.6.tgz) = 122985232 +TIMESTAMP = 1558475875 +SHA256 (graylog-3.0.2.tgz) = 12ee9bda9ff659c231eaf40a7b6f1aa3a8f28cb63506ae4b2a30d9b15a7789f7 +SIZE (graylog-3.0.2.tgz) = 113746670 Modified: head/sysutils/graylog/files/graylog.in ============================================================================== --- head/sysutils/graylog/files/graylog.in Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/files/graylog.in Wed May 22 21:15:41 2019 (r502290) @@ -55,14 +55,14 @@ load_rc_config $name : ${graylog_enable:="NO"} : ${graylog_user:="%%GRAYLOGUSER%%"} : ${graylog_group:="%%GRAYLOGGROUP%%"} -: ${graylog_config:="%%ETCDIR%%/server/server.conf"} +: ${graylog_config:="%%ETCDIR%%/graylog.conf"} : ${graylog_min_mem:="256m"} : ${graylog_max_mem:="1g"} : ${graylog_dir:="%%DATADIR%%"} : ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"} : ${graylog_logs_dir:="%%GRAYLOG_LOGS_DIR%%"} : ${graylog_run_dir:="/var/run/graylog"} -: ${graylog_log_config:="%%ETCDIR%%/server/log4j2.xml"} +: ${graylog_log_config:="%%ETCDIR%%/log4j2.xml"} java_options=" \ -Djava.awt.headless=true \ Modified: head/sysutils/graylog/files/log4j2.xml.in ============================================================================== --- head/sysutils/graylog/files/log4j2.xml.in Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/files/log4j2.xml.in Wed May 22 21:15:41 2019 (r502290) @@ -33,10 +33,7 @@ <!-- Silence useless session validation messages --> <Logger name="org.apache.shiro.session.mgt.AbstractValidatingSessionManager" level="warn"/> <Root level="warn"> - <AppenderRef ref="STDOUT"/> <AppenderRef ref="graylog-internal-logs"/> - </Root> - <Root level="error"> <AppenderRef ref="FreeBSD-logs"/> </Root> </Loggers> Modified: head/sysutils/graylog/files/pkg-message.in ============================================================================== --- head/sysutils/graylog/files/pkg-message.in Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/files/pkg-message.in Wed May 22 21:15:41 2019 (r502290) @@ -1,7 +1,7 @@ ====================================================================== -Please see %%ETCDIR%% for sample versions of server.conf, log4j.xml, and -graylog_logging.xml, and adjust them for your configuration. +Please see %%ETCDIR%% for sample versions of graylog.conf, log4j.xml, and +and adjust them for your configuration. For GeoIP support you need to install the net/GeoIP port and configure the path to the GeoIP databases in the Graylog Web Interface. @@ -14,4 +14,6 @@ For a single-node installation, install: - textproc/elasticsearch5 And ensure that the elasticsearch cluster name matches that used by graylog. -====================================================================== + +The locations for configuration files have changed to match upstream +versions in 3.0 of this port, refer to UPDATING for migration steps. Modified: head/sysutils/graylog/pkg-plist ============================================================================== --- head/sysutils/graylog/pkg-plist Wed May 22 21:09:07 2019 (r502289) +++ head/sysutils/graylog/pkg-plist Wed May 22 21:15:41 2019 (r502290) @@ -1,14 +1,9 @@ -@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/server/server.conf.sample -@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/server/log4j2.xml.sample %%DATADIR%%/graylog.jar -%%DATADIR%%/plugin/graylog-plugin-aws-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-beats-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-cef-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-collector-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-enterprise-integration-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-map-widget-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-netflow-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-pipeline-processor-%%PORTVERSION%%.jar -%%DATADIR%%/plugin/graylog-plugin-threatintel-%%PORTVERSION%%.jar -@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%GRAYLOG_DATA_DIR%% -@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%GRAYLOG_LOGS_DIR%% +%%DATADIR%%/plugin/%%PORTNAME%%-plugin-aws-%%DISTVERSION%%.jar +%%DATADIR%%/plugin/%%PORTNAME%%-plugin-collector-%%DISTVERSION%%.jar +%%DATADIR%%/plugin/%%PORTNAME%%-plugin-threatintel-%%DISTVERSION%%.jar +@dir %%ETCDIR%% +@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%% +@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%% +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.example +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.example
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905222115.x4MLFfVS092711>