svn commit: r569438 - in head/sysutils/graylog: . files

[Dave Cottlehuber]

Author: dch
Date: Mon Mar 29 08:44:06 2021
New Revision: 569438
URL: https://svnweb.freebsd.org/changeset/ports/569438

Log:
  sysutils/graylog: amend .sample to comply with tighter build rules
  
  - while here, remove forced IPv4 requirements, graylog is no longer so
    opinionated about this
  
  Reported by:	pkg-fallout
  Sponsored by:	SkunkWerks, GmbH

Modified:
  head/sysutils/graylog/Makefile
  head/sysutils/graylog/files/graylog.in
  head/sysutils/graylog/files/pkg-message.in
  head/sysutils/graylog/pkg-plist

Modified: head/sysutils/graylog/Makefile
==============================================================================
--- head/sysutils/graylog/Makefile	Mon Mar 29 08:20:51 2021	(r569437)
+++ head/sysutils/graylog/Makefile	Mon Mar 29 08:44:06 2021	(r569438)
@@ -3,6 +3,7 @@
 
 PORTNAME=	graylog
 DISTVERSION=	4.0.5
+PORTREVISION=	2
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.graylog.org/releases/
 DISTFILES=	graylog/${DISTNAME}${EXTRACT_SUFX} \
@@ -55,11 +56,13 @@ do-install:
 	@${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
+	${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \
+		${STAGEDIR}${ETCDIR}/graylog.conf.sample
+	${INSTALL_DATA} ${WRKDIR}/log4j2.xml \
+		${STAGEDIR}${ETCDIR}/log4j2.xml.sample
 	cd ${WRKDIR}/graylog-integrations-plugins-${DISTVERSION}/plugin && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/
 	cd ${WRKSRC}/plugin && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/
-	${INSTALL_DATA} ${WRKDIR}/log4j2.xml ${STAGEDIR}${ETCDIR}/log4j2.xml.example
 
 .include <bsd.port.mk>

Modified: head/sysutils/graylog/files/graylog.in
==============================================================================
--- head/sysutils/graylog/files/graylog.in	Mon Mar 29 08:20:51 2021	(r569437)
+++ head/sysutils/graylog/files/graylog.in	Mon Mar 29 08:44:06 2021	(r569438)
@@ -66,7 +66,6 @@ load_rc_config $name
 
 java_options=" \
     -Djava.awt.headless=true \
-    -Djava.net.preferIPv4Stack=true \
     -Dapp=${name} \
     -Dlog4j.configurationFile=${graylog_log_config} \
     -Xms${graylog_min_mem} \

Modified: head/sysutils/graylog/files/pkg-message.in
==============================================================================
--- head/sysutils/graylog/files/pkg-message.in	Mon Mar 29 08:20:51 2021	(r569437)
+++ head/sysutils/graylog/files/pkg-message.in	Mon Mar 29 08:44:06 2021	(r569438)
@@ -33,6 +33,12 @@ itself.
 Beginning with v4.0, Graylog Open Source is licensed under the
 Server Side Public License (SSPL). For more details, see
 https://www.graylog.org/post/graylog-v4-0-licensing-sspl
+
+If you are running on a dual-stack (ipv4+ipv6) system, you may need to
+include the additional JVM tuning parameter:
+
+    -Djava.net.preferIPv4Stack=true
+
 EOM
 }
 ]

Modified: head/sysutils/graylog/pkg-plist
==============================================================================
--- head/sysutils/graylog/pkg-plist	Mon Mar 29 08:20:51 2021	(r569437)
+++ head/sysutils/graylog/pkg-plist	Mon Mar 29 08:44:06 2021	(r569438)
@@ -8,5 +8,5 @@
 @dir %%ETCDIR%%
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%%
- at sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.example
- at sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.example
+ at sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample
+ at sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample