diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile index 48b04fb2e4e1..bf789c506d09 100644 --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -1,67 +1,68 @@ PORTNAME= graylog -DISTVERSION= 7.0.6 +DISTVERSION= 7.0.8 CATEGORIES= sysutils java -MASTER_SITES= https://downloads.graylog.org/releases/ -DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= https://downloads.graylog.org/releases/${PORTNAME}/ \ + LOCAL/vvd MAINTAINER= ports@FreeBSD.org COMMENT= Tool for centralized log collection WWW= https://www.graylog.org/ LICENSE= APACHE20 SSPLv1 LICENSE_COMB= multi LICENSE_NAME_SSPLv1= Server Side Public License LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe java:extract,run tar:tgz JAVA_VERSION= 21+ +USE_RC_SUBR= ${PORTNAME} -NO_BUILD= yes NO_ARCH= yes +NO_BUILD= yes -USE_RC_SUBR= graylog +GRAYLOG_DATA_DIR= /var/db/${PORTNAME} +GRAYLOG_LOGS_DIR= /var/log/${PORTNAME} SUB_FILES= log4j2.xml pkg-message - -GRAYLOGUSER?= graylog -GRAYLOGGROUP?= ${GRAYLOGUSER} -USERS= ${GRAYLOGUSER} -GROUPS= ${GRAYLOGGROUP} -GRAYLOG_DATA_DIR= /var/db/graylog -GRAYLOG_LOGS_DIR= /var/log/graylog - SUB_LIST= GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ GRAYLOGUSER=${GRAYLOGUSER} \ JAVA_HOME=${JAVA_HOME} +GRAYLOGUSER?= ${PORTNAME} +GRAYLOGGROUP?= ${GRAYLOGUSER} +.if ${GRAYLOGUSER} == ${PORTNAME} +USERS= ${GRAYLOGUSER} +.endif +.if ${GRAYLOGGROUP} == ${PORTNAME} +GROUPS= ${GRAYLOGGROUP} +.endif + PLIST_SUB= DISTVERSION=${DISTVERSION} \ GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ GRAYLOGUSER=${GRAYLOGUSER} \ PORTNAME=${PORTNAME} -post-extract: +post-patch: ${REINPLACE_CMD} -E \ - -e 's,^bin_dir .+,bin_dir = ${LOCALBASE}/share/graylog/bin,' \ - -e 's,^data_dir .+,data_dir = /var/db/graylog,' \ + -e 's,^bin_dir .+,bin_dir = ${PREFIX}/share/graylog/bin,' \ + -e 's,^data_dir .+,data_dir = ${GRAYLOG_DATA_DIR},' \ -e 's,^message_journal_dir .+,message_journal_dir = ${GRAYLOG_DATA_DIR}/journal,' \ -e 's,^node_id_file .+,node_id_file = ${ETCDIR}/server/node-id,' \ ${WRKSRC}/graylog.conf.example do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/plugin - @${MKDIR} ${STAGEDIR}${ETCDIR}/server - @${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal - @${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR} + ${MKDIR} ${STAGEDIR}${ETCDIR}/server \ + ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal \ + ${STAGEDIR}${GRAYLOG_LOGS_DIR} + (cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin) ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \ ${STAGEDIR}${ETCDIR}/graylog.conf.sample ${INSTALL_DATA} ${WRKDIR}/log4j2.xml \ ${STAGEDIR}${ETCDIR}/log4j2.xml.sample - cd ${WRKSRC}/plugin && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/ .include diff --git a/sysutils/graylog/distinfo b/sysutils/graylog/distinfo index 3a8757d8da4b..a4ce66825ed9 100644 --- a/sysutils/graylog/distinfo +++ b/sysutils/graylog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1777880877 -SHA256 (graylog/graylog-7.0.6.tgz) = c7857905fc36425b962f452b45ad273d9d97d076d7b19f00cdb6d13f9671577a -SIZE (graylog/graylog-7.0.6.tgz) = 324845848 +TIMESTAMP = 1781818181 +SHA256 (graylog-7.0.8.tgz) = 50ac5ec9d66b11c1ff0fa741c1920d87a23df5d7699fd024968ca86fff457703 +SIZE (graylog-7.0.8.tgz) = 324847952 diff --git a/sysutils/graylog/files/graylog.in b/sysutils/graylog/files/graylog.in index aff849de8e10..e3bd40165af9 100644 --- a/sysutils/graylog/files/graylog.in +++ b/sysutils/graylog/files/graylog.in @@ -1,115 +1,115 @@ #!/bin/sh # # PROVIDE: graylog # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: shutdown # # graylog_enable (bool): # Default value: "NO" # Flag that determines whether graylog is enabled # # graylog_user (username): -# Default value: "graylog" +# Default value: "%%GRAYLOGUSER%%" # Name of the graylog user account # # graylog_group (group): -# Default value: "graylog" +# Default value: "%%GRAYLOGGROUP%%" # Name of the graylog group # # graylog_config (string) # Default value %%ETCDIR%%/graylog.conf # Path to the graylog configuration file # # graylog_min_mem (string): # Default value: 256m # Minumum JVM heap size # # graylog_max_mem (string): # Default value: 1g # Maximum JVM heap size # # graylog_dir (string): # 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 +# Default value: /var/run/graylog # Path to the graylog run folder. # # graylog_log_config (string): # Default value: %%ETCDIR%%/server/log4j2.xml # Path to the Graylog Server logfile # # graylog_java_home (path): # Default value: %%JAVA_HOME%% # Set it to the root of the JDK to use. . /etc/rc.subr name=graylog rcvar=graylog_enable load_rc_config $name : ${graylog_enable:="NO"} : ${graylog_config:="%%ETCDIR%%/graylog.conf"} : ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"} : ${graylog_dir:="%%DATADIR%%"} : ${graylog_group:="%%GRAYLOGGROUP%%"} : ${graylog_java_home:="%%JAVA_HOME%%"} : ${graylog_java_opts:=""} : ${graylog_log_config:="%%ETCDIR%%/log4j2.xml"} : ${graylog_logs_dir:="%%GRAYLOG_LOGS_DIR%%"} : ${graylog_max_mem:="1g"} : ${graylog_min_mem:="256m"} : ${graylog_run_dir:="/var/run/graylog"} : ${graylog_user:="%%GRAYLOGUSER%%"} java_options=" \ -Dapp=${name} \ -Djava.awt.headless=true \ -Dlog4j.configurationFile=${graylog_log_config} \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:+ResizeTLAB \ -XX:+UseCompressedOops \ -XX:-OmitStackTraceInFastThrow \ -XX:NewRatio=1 \ -Xms${graylog_min_mem} \ -Xmx${graylog_max_mem} \ ${graylog_java_opts} \ " app_pidfile="${graylog_run_dir}/${name}.pid" pidfile="${graylog_run_dir}/daemon.pid" command="/usr/sbin/daemon" command_args=" \ -c \ -t ${name} \ -r \ -p ${app_pidfile} \ -P ${pidfile} \ %%LOCALBASE%%/bin/java \ ${java_options} \ -jar ${graylog_dir}/graylog.jar server \ --no-pid-file \ --configfile ${graylog_config}" export JAVA_HOME=${graylog_java_home} required_files="%%LOCALBASE%%/bin/java ${graylog_config}" graylog_precmd() { install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}" install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_logs_dir}" install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}" } start_precmd="graylog_precmd" run_rc_command "$1" diff --git a/sysutils/graylog/pkg-plist b/sysutils/graylog/pkg-plist index 99e24b121899..bc0dfe107782 100644 --- a/sysutils/graylog/pkg-plist +++ b/sysutils/graylog/pkg-plist @@ -1,10 +1,9 @@ %%DATADIR%%/graylog.jar %%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch7-%%DISTVERSION%%.jar %%DATADIR%%/plugin/%%PORTNAME%%-storage-opensearch2-%%DISTVERSION%%.jar @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%ETCDIR%%/server @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%% @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%/journal @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%% @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample -