kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove the unneeded .sample files in $DATADIR/itl. The .conf files there

Browse source 
should never be touched by a user.
- Add a pkg-message with a notice on major upgrades
- Bump PORTREVISION
This commit is contained in:
Lars Engels 2015-11-17 21:22:08 +00:00
parent dceac2dff9
commit 9d3fdde10f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=401822
5 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net-mgmt/icinga2/Makefile
View file

@ -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 \;

10
net-mgmt/icinga2/files/patch-itl_CMakeLists.txt
View file

@ -1,10 +0,0 @@
--- itl/CMakeLists.txt.orig 2015-07-13 22:14:51.872881000 +0200
+++ itl/CMakeLists.txt 2015-07-13 22:15:19.702183000 +0200
@@ -18,6 +18,6 @@
add_subdirectory(plugins-contrib.d)
install(
- FILES itl command.conf command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf windows-plugins command-plugins-windows.conf nscp command-nscp-local.conf plugins-contrib
+ FILES itl command.conf.sample command-icinga.conf.sample hangman timeperiod.conf.sample plugins command-plugins.conf.sample manubulon command-plugins-manubulon.conf.sample windows-plugins command-plugins-windows.conf.sample nscp command-nscp-local.conf.sample plugins-contrib
DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include
)

10
net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt
View file

@ -1,10 +0,0 @@
--- itl/plugins-contrib.d/CMakeLists.txt.orig 2015-10-19 11:14:40.000000000 +0200
+++ itl/plugins-contrib.d/CMakeLists.txt 2015-10-26 15:42:41.023004000 +0100
@@ -16,6 +16,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
install(
- FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf hardware.conf
+ FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample hardware.conf.sample
DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include/plugins-contrib.d
)

3
net-mgmt/icinga2/files/pkg-message.in Normal file
View file

@ -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.

30
net-mgmt/icinga2/pkg-plist
View file

@ -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