From owner-svn-ports-all@freebsd.org Sat Nov 10 16:56:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DF311103FA4; Sat, 10 Nov 2018 16:56:10 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 854D472D96; Sat, 10 Nov 2018 16:56:09 +0000 (UTC) (envelope-from woodsb02@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 66D5725A21; Sat, 10 Nov 2018 16:56:09 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAGu9ZL031857; Sat, 10 Nov 2018 16:56:09 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAGu8qL031852; Sat, 10 Nov 2018 16:56:08 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201811101656.wAAGu8qL031852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 10 Nov 2018 16:56:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484624 - in head/net-mgmt/icinga2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/net-mgmt/icinga2: . files X-SVN-Commit-Revision: 484624 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 854D472D96 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 16:56:10 -0000 Author: woodsb02 Date: Sat Nov 10 16:56:08 2018 New Revision: 484624 URL: https://svnweb.freebsd.org/changeset/ports/484624 Log: net-mgmt/icinga2: Use .conf suffix for /usr/local/etc/newsyslog.conf.d/ Rename files intended for installation to /usr/local/etc/newsyslog.conf.d/ to end with a '.conf' suffix. Proposed changes to /etc/newsyslog.conf will only include files from the /usr/local/etc/newsyslog.conf.d/ directory which end with '.conf' and do not beginning with a '.' character. https://reviews.freebsd.org/D17086 Approved by: lme (maintainer) Differential Revision: https://reviews.freebsd.org/D17091 Added: head/net-mgmt/icinga2/files/icinga2-newsyslog.conf.in - copied unchanged from r484623, head/net-mgmt/icinga2/files/icinga2-newsyslog.in Deleted: head/net-mgmt/icinga2/files/icinga2-newsyslog.in Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/files/pkg-message.in head/net-mgmt/icinga2/pkg-plist Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Sat Nov 10 16:32:37 2018 (r484623) +++ head/net-mgmt/icinga2/Makefile Sat Nov 10 16:56:08 2018 (r484624) @@ -68,7 +68,7 @@ PLIST_SUB= ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} -SUB_FILES= pkg-message ${PORTNAME}-newsyslog +SUB_FILES= pkg-message ${PORTNAME}-newsyslog.conf # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf @@ -98,7 +98,7 @@ pre-install: post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/ - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}.conf ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles (cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/share/vim/vimfiles) Copied: head/net-mgmt/icinga2/files/icinga2-newsyslog.conf.in (from r484623, head/net-mgmt/icinga2/files/icinga2-newsyslog.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/icinga2/files/icinga2-newsyslog.conf.in Sat Nov 10 16:56:08 2018 (r484624, copy of r484623, head/net-mgmt/icinga2/files/icinga2-newsyslog.in) @@ -0,0 +1,3 @@ +%%ICINGA2LOGDIR%%/debug.log %%ICINGA2USER%%:%%ICINGA2GROUP%% 644 7 * @T00 X +%%ICINGA2LOGDIR%%/error.log %%ICINGA2USER%%:%%ICINGA2GROUP%% 644 90 * @T00 X +%%ICINGA2LOGDIR%%/icinga2.log %%ICINGA2USER%%:%%ICINGA2GROUP%% 644 7 * @T00 X /var/run/icinga2/icinga2.pid SIGUSR1 Modified: head/net-mgmt/icinga2/files/pkg-message.in ============================================================================== --- head/net-mgmt/icinga2/files/pkg-message.in Sat Nov 10 16:32:37 2018 (r484623) +++ head/net-mgmt/icinga2/files/pkg-message.in Sat Nov 10 16:56:08 2018 (r484624) @@ -2,5 +2,5 @@ If you do a major upgrade of Icinga 2 and use a databa http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2 how to upgrade the database. -To rotate Icinga 2's logfiles, you can copy %%EXAMPLESDIR%%/newsyslog/icinga2 +To rotate Icinga 2's logfiles, you can copy %%EXAMPLESDIR%%/newsyslog/icinga2.conf to %%LOCALBASE%%/etc/newsyslog.conf.d/ Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Sat Nov 10 16:32:37 2018 (r484623) +++ head/net-mgmt/icinga2/pkg-plist Sat Nov 10 16:56:08 2018 (r484624) @@ -119,7 +119,7 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/nano-syntax.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/postgr-import-ido.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/vim-syntax.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2.conf %%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql