From owner-svn-ports-head@freebsd.org Sat Jul 11 13:48:31 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A394C3631C8; Sat, 11 Jul 2020 13:48:31 +0000 (UTC) (envelope-from sbz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3rpl3r6Mz3gnC; Sat, 11 Jul 2020 13:48:31 +0000 (UTC) (envelope-from sbz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 627DB1395C; Sat, 11 Jul 2020 13:48:31 +0000 (UTC) (envelope-from sbz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06BDmVvU073589; Sat, 11 Jul 2020 13:48:31 GMT (envelope-from sbz@FreeBSD.org) Received: (from sbz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06BDmVLl073588; Sat, 11 Jul 2020 13:48:31 GMT (envelope-from sbz@FreeBSD.org) Message-Id: <202007111348.06BDmVLl073588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbz set sender to sbz@FreeBSD.org using -f From: Sofian Brabez Date: Sat, 11 Jul 2020 13:48:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541974 - in head/sysutils/goaccess: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sbz X-SVN-Commit-Paths: in head/sysutils/goaccess: . files X-SVN-Commit-Revision: 541974 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jul 2020 13:48:31 -0000 Author: sbz Date: Sat Jul 11 13:48:30 2020 New Revision: 541974 URL: https://svnweb.freebsd.org/changeset/ports/541974 Log: - Make portlint happy, enable SSL, and add a rc.d script PR: 234652 Submitted by: Zane C. Bowers-Hadley Added: head/sysutils/goaccess/files/goaccess.in (contents, props changed) Modified: head/sysutils/goaccess/Makefile Modified: head/sysutils/goaccess/Makefile ============================================================================== --- head/sysutils/goaccess/Makefile Sat Jul 11 13:32:34 2020 (r541973) +++ head/sysutils/goaccess/Makefile Sat Jul 11 13:48:30 2020 (r541974) @@ -3,7 +3,7 @@ PORTNAME= goaccess PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://tar.goaccess.io/ @@ -13,23 +13,23 @@ COMMENT= Real-time Apache web log analyzer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes USES= alias compiler:c11 pkgconfig ncurses +USE_RC_SUBR= goaccess +INSTALL_TARGET= install-strip +GNU_CONFIGURE= yes + CFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO -OPTIONS_DEFINE= DOCS DEBUG GEOIP2 NLS UTF8 -OPTIONS_DEFAULT= GEOIP2 UTF8 +OPTIONS_DEFINE= DOCS DEBUG GEOIP2 NLS SSL UTF8 +OPTIONS_DEFAULT= GEOIP2 SSL UTF8 OPTIONS_RADIO= TOKYOCABINET OPTIONS_RADIO_TOKYOCABINET= TOKYOCABINET_BTREE TOKYOCABINET_MHASH OPTIONS_SUB= yes - DEBUG_CONFIGURE_ON= --enable-debug NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime @@ -38,6 +38,9 @@ UTF8_CONFIGURE_ON= --enable-utf8 GEOIP2_DESC= IP location support GEOIP2_CONFIGURE_ON= --enable-geoip=mmdb GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb + +SSL_DESC= Use SSL for WebSocket +SSL_CONFIGURE_ON= --with-openssl TOKYOCABINET_DESC= Tokyo Cabinet support TOKYOCABINET_BTREE_DESC= Storage using on-disk B+ Tree Added: head/sysutils/goaccess/files/goaccess.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/goaccess/files/goaccess.in Sat Jul 11 13:48:30 2020 (r541974) @@ -0,0 +1,45 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: goaccess +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable goaccess. +# +# goaccess_html (path): Set to /var/run/goaccess/goaccess.html +# by default. +# goaccess_log (path): Set to /var/log/httpd-access.log +# by default. +# goaccess_config (str): Set to %%PREFIX%%/etc/goaccess.conf +# by default. Only used if the file exists. + +. /etc/rc.subr + +name=goaccess +rcvar=goaccess_enable + +load_rc_config $name + +: ${goaccess_html:=/var/run/goaccess/goaccess.html} +: ${goaccess_log:=/var/log/httpd-access.log} +: ${goaccess_config:=%%PREFIX%%/etc/goaccess/goaccess.conf} + +command=/usr/local/bin/${name} +pidfile=/var/run/${name}.pid + +# This is done to allow Directory be used for when configuring Apache +# as Files does not allow for a full path. +start_precmd=start_precmd +start_precmd() +{ + if [ $goaccess_html = /var/run/goaccess/goaccess.html ]; then + if [ ! -d /var/run/goaccess ]; then + mkdir /var/run/goaccess + fi + fi +} + +command_args="--daemonize --real-time-html --pid-file=$pidfile -p $goaccess_config -o $goaccess_html" +run_rc_command "$1"