Date: Sat, 10 Nov 2018 16:56:08 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> 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 Message-ID: <201811101656.wAAGu8qL031852@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811101656.wAAGu8qL031852>