diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2018-11-10 16:56:08 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2018-11-10 16:56:08 +0000 |
| commit | 2b51c906f0628ef3b26e2399165ecc2888343eab (patch) | |
| tree | 678ed13a5dc7815a9b283cb42534678eaedb7828 | |
| parent | devel/py-libvirt: update to 4.9.0 (diff) | |
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
| -rw-r--r-- | net-mgmt/icinga2/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/icinga2/files/icinga2-newsyslog.conf.in (renamed from net-mgmt/icinga2/files/icinga2-newsyslog.in) | 0 | ||||
| -rw-r--r-- | net-mgmt/icinga2/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | net-mgmt/icinga2/pkg-plist | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index ac1ceec376eb..af52c890706f 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -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) diff --git a/net-mgmt/icinga2/files/icinga2-newsyslog.in b/net-mgmt/icinga2/files/icinga2-newsyslog.conf.in index f931f79037a8..f931f79037a8 100644 --- a/net-mgmt/icinga2/files/icinga2-newsyslog.in +++ b/net-mgmt/icinga2/files/icinga2-newsyslog.conf.in diff --git a/net-mgmt/icinga2/files/pkg-message.in b/net-mgmt/icinga2/files/pkg-message.in index 3afe9242a030..4148edfbae89 100644 --- a/net-mgmt/icinga2/files/pkg-message.in +++ b/net-mgmt/icinga2/files/pkg-message.in @@ -2,5 +2,5 @@ If you do a major upgrade of Icinga 2 and use a database, please see 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/ diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist index 77b37c26d1d2..703f2a31c2d1 100644 --- a/net-mgmt/icinga2/pkg-plist +++ b/net-mgmt/icinga2/pkg-plist @@ -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 |