Date: Thu, 19 Sep 2019 15:31:11 +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: r512350 - in head/net-mgmt/icinga2: . files Message-ID: <201909191531.x8JFVBGa045890@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Thu Sep 19 15:31:10 2019 New Revision: 512350 URL: https://svnweb.freebsd.org/changeset/ports/512350 Log: net-mgmt/icinga2: - Update to 2.11.0 - Remove "icinga2_mkvar" rc.conf variable from the rc script. All needed directories are now created on startup. Release Announcement: https://icinga.com/2019/09/19/icinga-2-11/ Changelog: https://github.com/Icinga/icinga2/blob/master/CHANGELOG.md Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/distinfo head/net-mgmt/icinga2/files/icinga2.in 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 Thu Sep 19 15:14:41 2019 (r512349) +++ head/net-mgmt/icinga2/Makefile Thu Sep 19 15:31:10 2019 (r512350) @@ -2,8 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.10.5 -PORTREVISION= 2 +DISTVERSION= 2.11.0 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org @@ -12,8 +11,7 @@ COMMENT= Monitoring and management system for hosts, s LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libyajl.so:devel/yajl +LIB_DEPENDS= libboost_system.so:devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= alias bison cmake:insource compiler:c++0x libedit ssl Modified: head/net-mgmt/icinga2/distinfo ============================================================================== --- head/net-mgmt/icinga2/distinfo Thu Sep 19 15:14:41 2019 (r512349) +++ head/net-mgmt/icinga2/distinfo Thu Sep 19 15:31:10 2019 (r512350) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558688104 -SHA256 (icinga-icinga2-v2.10.5_GH0.tar.gz) = c965c2b6fa697fbb5d87c928798a28f293050a8475b6a46d728dc3f222b1319a -SIZE (icinga-icinga2-v2.10.5_GH0.tar.gz) = 5141193 +TIMESTAMP = 1568881312 +SHA256 (icinga-icinga2-v2.11.0_GH0.tar.gz) = f1702a598aed458cce44668526db8d655a68f270e408f10b859eaac175ccdb51 +SIZE (icinga-icinga2-v2.11.0_GH0.tar.gz) = 7472579 Modified: head/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- head/net-mgmt/icinga2/files/icinga2.in Thu Sep 19 15:14:41 2019 (r512349) +++ head/net-mgmt/icinga2/files/icinga2.in Thu Sep 19 15:31:10 2019 (r512350) @@ -31,7 +31,6 @@ load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} -: ${icinga2_mkvar:="NO"} : ${icinga2_user:="%%ICINGA2USER%%"} : ${icinga2_group:="%%ICINGA2GROUP%%"} : ${icinga2_webgroup:="www"} @@ -86,24 +85,20 @@ reload_precmd() { } start_precmd() { - if checkyesno "icinga2_mkvar"; then - # Create necessary directories / change ownership - # While this is also done through pkg-plist, /var might be on a ramdisk, - # so make sure all needed files and directories are created before starting - # Icinga. - for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ - "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ - "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ - "${icinga2_rundir}" "${icinga2_cachedir}"; do - if [ ! -d "${d}" ]; then - install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" - fi - done + # Create necessary directories / change ownership + # While this is also done through pkg-plist, /var might be on a ramdisk, + # so make sure all needed files and directories are created before starting + # Icinga. + for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ + "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ + "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ + "${icinga2_rundir}" "${icinga2_cachedir}"; do + if [ ! -d "${d}" ]; then + install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" + fi + done - install -d -o ${icinga2_user} -g ${icinga2_webgroup} "${icinga2_rundir}/cmd" - - - fi + install -d -o ${icinga2_user} -g ${icinga2_webgroup} -m 2750 "${icinga2_rundir}/cmd" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_libdir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_spooldir}" Modified: head/net-mgmt/icinga2/files/pkg-message.in ============================================================================== --- head/net-mgmt/icinga2/files/pkg-message.in Thu Sep 19 15:14:41 2019 (r512349) +++ head/net-mgmt/icinga2/files/pkg-message.in Thu Sep 19 15:31:10 2019 (r512350) @@ -10,6 +10,9 @@ EOM 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. + +Please remove the rc.conf variable 'icinga2_mkvar'. All needed directories are +now created as needed. EOM } ] Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Thu Sep 19 15:14:41 2019 (r512349) +++ head/net-mgmt/icinga2/pkg-plist Thu Sep 19 15:31:10 2019 (r512350) @@ -37,9 +37,9 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.5 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.11.0 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.5 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.11.0 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz @@ -50,9 +50,9 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md -%%PORTDOCS%%%%DOCSDIR%%/markdown/02-getting-started.md +%%PORTDOCS%%%%DOCSDIR%%/markdown/02-installation.md %%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md -%%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuring-icinga-2.md +%%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuration.md %%PORTDOCS%%%%DOCSDIR%%/markdown/05-service-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/06-distributed-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/07-agent-based-monitoring.md @@ -74,6 +74,8 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/23-migrating-from-icinga-1x.md %%PORTDOCS%%%%DOCSDIR%%/markdown/24-appendix.md %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/dashing_icinga2.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_certificate_monitoring.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_reporting.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_businessprocess.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_grafana.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_graphite.png @@ -81,19 +83,26 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/flapping-state-graph.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icingaweb2_downtime_handled.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_endpoints.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_roles.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_ha_master_clients.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_clients.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_satellite_client.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_command_endpoint.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_config_sync.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/api/icinga2_api_powershell_ise.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/configuration/icinga_web_local_server.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_boost_build_dev_cmd.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_builds_gitlab_pipeline.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_powershell_posh_git.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_01.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_02.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_03.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_tabs_c++.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_agent_checks_command_endpoint.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_endpoints.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_roles.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_satellite_config_sync.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenario_ha_masters_with_agents.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_satellites_agents.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_with_agents.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_zones.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_zones.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_cmd_admin_net_start_stop.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_running_service.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png @@ -115,14 +124,15 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png -%%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/mariadb-centos7.png -%%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 +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/mariadb-centos7.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/nano-syntax.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/postgr-import-ido.png +%%PORTDOCS%%%%DOCSDIR%%/markdown/images/installation/vim-syntax.png %%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 +%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.11.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.3.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.4.0.sql @@ -173,6 +183,7 @@ share/vim/vimfiles/syntax/icinga2.vim @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones-stage @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certificate-requests @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909191531.x8JFVBGa045890>