diff options
| author | Dave Cottlehuber <dch@FreeBSD.org> | 2021-03-29 08:44:06 +0000 |
|---|---|---|
| committer | Dave Cottlehuber <dch@FreeBSD.org> | 2021-03-29 08:44:06 +0000 |
| commit | 6d4f32562b05d85ab7876caa7e9d32590f593bfc (patch) | |
| tree | 358dc952c94be4fb1f421148d300a5591f3a0e23 /sysutils/graylog | |
| parent | 23b6adb432bc4dbd33e559727625398f9943fd4e (diff) | |
| download | ports-6d4f32562b05d85ab7876caa7e9d32590f593bfc.tar.gz ports-6d4f32562b05d85ab7876caa7e9d32590f593bfc.zip | |
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
Notes
Notes:
svn path=/head/; revision=569438
Diffstat (limited to 'sysutils/graylog')
| -rw-r--r-- | sysutils/graylog/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/graylog/files/graylog.in | 1 | ||||
| -rw-r--r-- | sysutils/graylog/files/pkg-message.in | 6 | ||||
| -rw-r--r-- | sysutils/graylog/pkg-plist | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile index 9367bb23c187..dce8b7decf93 100644 --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -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> diff --git a/sysutils/graylog/files/graylog.in b/sysutils/graylog/files/graylog.in index fd841b7adda9..3530a2a57120 100644 --- a/sysutils/graylog/files/graylog.in +++ b/sysutils/graylog/files/graylog.in @@ -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} \ diff --git a/sysutils/graylog/files/pkg-message.in b/sysutils/graylog/files/pkg-message.in index 0cb4b5413ac1..30e987726162 100644 --- a/sysutils/graylog/files/pkg-message.in +++ b/sysutils/graylog/files/pkg-message.in @@ -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 } ] diff --git a/sysutils/graylog/pkg-plist b/sysutils/graylog/pkg-plist index 3879cf122128..bc732afc68cb 100644 --- a/sysutils/graylog/pkg-plist +++ b/sysutils/graylog/pkg-plist @@ -8,5 +8,5 @@ @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 +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample +@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample |