Date: Tue, 17 Nov 2015 21:22:08 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401822 - in head/net-mgmt/icinga2: . files Message-ID: <201511172122.tAHLM8mT097200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Nov 17 21:22:08 2015 New Revision: 401822 URL: https://svnweb.freebsd.org/changeset/ports/401822 Log: - Remove the unneeded .sample files in $DATADIR/itl. The .conf files there should never be touched by a user. - Add a pkg-message with a notice on major upgrades - Bump PORTREVISION Added: head/net-mgmt/icinga2/files/pkg-message.in (contents, props changed) Deleted: head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/pkg-plist Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Tue Nov 17 17:35:31 2015 (r401821) +++ head/net-mgmt/icinga2/Makefile Tue Nov 17 21:22:08 2015 (r401822) @@ -3,7 +3,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org @@ -94,7 +94,6 @@ post-patch: pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; - ${FIND} ${WRKSRC}/itl -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; Added: head/net-mgmt/icinga2/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/icinga2/files/pkg-message.in Tue Nov 17 21:22:08 2015 (r401822) @@ -0,0 +1,3 @@ +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. Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Tue Nov 17 17:35:31 2015 (r401821) +++ head/net-mgmt/icinga2/pkg-plist Tue Nov 17 21:22:08 2015 (r401822) @@ -99,27 +99,27 @@ sbin/icinga2 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql -@sample %%DATADIR%%/include/command-icinga.conf.sample -@sample %%DATADIR%%/include/command-nscp-local.conf.sample -@sample %%DATADIR%%/include/command-plugins-manubulon.conf.sample -@sample %%DATADIR%%/include/command-plugins-windows.conf.sample -@sample %%DATADIR%%/include/command-plugins.conf.sample -@sample %%DATADIR%%/include/command.conf.sample +%%DATADIR%%/include/command-icinga.conf +%%DATADIR%%/include/command-nscp-local.conf +%%DATADIR%%/include/command-plugins-manubulon.conf +%%DATADIR%%/include/command-plugins-windows.conf +%%DATADIR%%/include/command-plugins.conf +%%DATADIR%%/include/command.conf %%DATADIR%%/include/hangman %%DATADIR%%/include/itl %%DATADIR%%/include/manubulon %%DATADIR%%/include/nscp %%DATADIR%%/include/plugins %%DATADIR%%/include/plugins-contrib -@sample %%DATADIR%%/include/plugins-contrib.d/databases.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/ipmi.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/hardware.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/network-components.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/operating-system.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/virtualization.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/vmware.conf.sample -@sample %%DATADIR%%/include/plugins-contrib.d/web.conf.sample -@sample %%DATADIR%%/include/timeperiod.conf.sample +%%DATADIR%%/include/plugins-contrib.d/databases.conf +%%DATADIR%%/include/plugins-contrib.d/ipmi.conf +%%DATADIR%%/include/plugins-contrib.d/hardware.conf +%%DATADIR%%/include/plugins-contrib.d/network-components.conf +%%DATADIR%%/include/plugins-contrib.d/operating-system.conf +%%DATADIR%%/include/plugins-contrib.d/virtualization.conf +%%DATADIR%%/include/plugins-contrib.d/vmware.conf +%%DATADIR%%/include/plugins-contrib.d/web.conf +%%DATADIR%%/include/timeperiod.conf %%DATADIR%%/include/windows-plugins @dir %%ETCDIR%%/pki @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511172122.tAHLM8mT097200>