Remove bottom-up repository.d references

refs #4799

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 3d2c077d764f42c99ce02676fd3fc64813f27f35..46bc6ffb03e5c221d0bcdeb4fff4c6318ac9f151 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -63,14 +63,12 @@ endif()
 install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d)
-install_if_not_exists(icinga2/repository.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/repository.d)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
 endif()
 
 install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/pki\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/repository.d\")")
 
 if(NOT WIN32)
   install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/features-enabled\")")

diff --git a/etc/icinga2/conf.d/satellite.conf b/etc/icinga2/conf.d/satellite.conf
deleted file mode 100644 (file)
index 4a6b97a..0000000
--- a/etc/icinga2/conf.d/satellite.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Host and Service templates for the Agent Setup.
- */
-
-
-/**
- * Provides settings for satellite hosts managed by 'icinga2 repository'.
- * Define your global attributes here, for example custom
- * attributes used for notifications, etc.
- */
-template Host "satellite-host" {
-  vars.notification["mail"] = {
-    groups = [ "icingaadmins" ]
-  }
-}
-
-/**
- * Provides settings for satellite services managed by 'icinga2 repository'.
- * Define your global satellite attributes here, for example custom
- * attributes used for notifications, etc.
- */
-template Service "satellite-service" {
-  vars.notification["mail"] = {
-    groups = [ "icingaadmins" ]
-  }
-}
-
-
-apply Dependency "satellite-host" to Host {
-  parent_host_name = host.zone
-
-  assign where host.zone != "" && "satellite-host" in host.templates
-}

diff --git a/etc/icinga2/icinga2.conf b/etc/icinga2/icinga2.conf
index a809b96949804586f2311e23277ee802a9d3b532..17513a34618a022d91b8bcedf652a46ff4267eae 100644 (file)
--- a/etc/icinga2/icinga2.conf
+++ b/etc/icinga2/icinga2.conf
@@ -49,12 +49,6 @@ include <nscp>
  */
 include "features-enabled/*.conf"
 
-/**
- * The repository.d directory contains all configuration objects
- * managed by the 'icinga2 repository' CLI commands.
- */
-include_recursive "repository.d"
-
 /**
  * Although in theory you could define all your objects in this file
  * the preferred way is to create separate directories and files in the conf.d

diff --git a/etc/icinga2/repository.d/README b/etc/icinga2/repository.d/README
deleted file mode 100644 (file)
index a5da082..0000000
--- a/etc/icinga2/repository.d/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains configuration files managed by 'icinga2 repository'
-cli commands. Please run 'icinga2 repository --help' to see all available
-options.

diff --git a/etc/icinga2/win32/icinga2.conf b/etc/icinga2/win32/icinga2.conf
index ecd6120303bc7cadf0eebc4614699da7c75719d1..cc47c410a19b9815720375e2bbb82134137945f5 100644 (file)
--- a/etc/icinga2/win32/icinga2.conf
+++ b/etc/icinga2/win32/icinga2.conf
@@ -47,12 +47,6 @@ include <nscp>
  */
 include "features-enabled/*.conf"
 
-/**
- * The repository.d directory contains all configuration objects
- * managed by the 'icinga2 repository' CLI commands.
- */
-include_recursive "repository.d"
-
 /**
  * Although in theory you could define all your objects in this file
  * the preferred way is to create separate directories and files in the conf.d

diff --git a/icinga2.spec b/icinga2.spec
index 4eaa3e72c083b683145b9a1f89ac79263aab91c8..b1f27100a4100ee13f4eb03555632cde9118d870 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -657,9 +657,7 @@ fi
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available
 %exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %attr(0640,root,%{icinga_group}) %{_sysconfdir}/%{name}/init.conf
@@ -667,7 +665,6 @@ fi
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf
-%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/repository.d/*
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/scripts/*
 %dir %{_libexecdir}/%{name}
@@ -731,5 +728,3 @@ fi
 %{_datadir}/nano/%{name}.nanorc
 
 %changelog
-* Tue Jun 20 2017 Markus Frosch <markus.frosch@icinga.com> 2.7.0-1
-- Update to 2.7.0