Cli: Make sure to create & include 'repository.d'

refs #7255

diff --git a/doc/1-about.md b/doc/1-about.md
index 5b224a46d7bfd23a7adb064003d3b9ae55257516..abba13252238d9321db7bd1505aeecf5da8273eb 100644 (file)
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -56,6 +56,7 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant).
     * `icinga2-{enable,disable}-feature` tool = cli command `icinga2 feature {enable,disable}` #7250
     * `icinga2-list-objects` tool = cli command `icinga2 object list` #7251
     * `icinga2-build-{ca,key}` can be used with cli command `icinga2 pki` #7247
+* `icinga2 repository` manages `/etc/icinga2/repository.d` which must be included in `icinga2.conf` #7255
 
 * `python-icinga2` package dropped in favor of cli commands #7245
 * GraphiteWriter: Add warn/crit/min/max perfdata and downtime_depth stats values #7366 #6946

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index f6cc9edeb4511b9ccd0cc2f0825fae1cfd0d0078..b4dbe57e09567899de2dd88b75f1a9ce9d73ebf0 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -61,6 +61,7 @@ install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYS
 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)
 install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
 
 install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/pki\")")

diff --git a/etc/icinga2/icinga2.conf b/etc/icinga2/icinga2.conf
index 8829f0cc534fc266ebefb01a71779a057f073730..69bbee3d95298b936b84a2dcddfe2144d03fb6b7 100644 (file)
--- a/etc/icinga2/icinga2.conf
+++ b/etc/icinga2/icinga2.conf
@@ -35,6 +35,12 @@ include <plugins>
  */
 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
new file mode 100644 (file)
index 0000000..a5da082
--- /dev/null
+++ b/etc/icinga2/repository.d/README
@@ -0,0 +1,3 @@
+This directory contains configuration files managed by 'icinga2 repository'
+cli commands. Please run 'icinga2 repository --help' to see all available
+options.

diff --git a/icinga2.spec b/icinga2.spec
index 19fa044ad7eee007aba447babcdf45869d454622..87782d0768a08bf8522268f8410b9b52f3747cda 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -441,6 +441,7 @@ exit 0
 %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,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/init.conf
@@ -450,6 +451,7 @@ exit 0
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/*.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/localhost/*.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/*
 %{_sbindir}/%{name}