daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 1a0aaeb3652129c4ca1218e883ffb4d21afd37c7..e238d185fa9141e08887622dd6db57c19e6bca23 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -829,7 +829,8 @@ maybe chmod 0644 'icinga2/constants.conf'
 maybe chmod 0644 'icinga2/constants.conf.orig'
 maybe chmod 0755 'icinga2/features-available'
 maybe chmod 0644 'icinga2/features-available/api.conf'
-maybe chmod 0644 'icinga2/features-available/api.conf.orig'
+maybe chmod 0644 'icinga2/features-available/api.conf.orig.2017-10-10'
+maybe chmod 0644 'icinga2/features-available/api.conf.orig.2017-11-16'
 maybe chmod 0644 'icinga2/features-available/checker.conf'
 maybe chmod 0644 'icinga2/features-available/command.conf'
 maybe chmod 0644 'icinga2/features-available/compatlog.conf'

diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf
index 28bf922e7a3d4c2c9f296d5fc5e0b18df2819787..588ad54f9047655e257b3e905d88e4477714ca52 100644 (file)
--- a/icinga2/features-available/api.conf
+++ b/icinga2/features-available/api.conf
@@ -1,10 +1,10 @@
 /**
  * The API listener is used for distributed monitoring setups.
  */
+
 object ApiListener "api" {
-  cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt"
-  key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key"
-  ca_path = SysconfDir + "/icinga2/pki/ca.crt"
+  accept_config = true
+  accept_commands = true
 
   ticket_salt = TicketSalt
 }

diff --git a/icinga2/features-available/api.conf.orig b/icinga2/features-available/api.conf.orig
deleted file mode 100644 (file)
index 0136de0..0000000
--- a/icinga2/features-available/api.conf.orig
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * The API listener is used for distributed monitoring setups.
- */
-
-object ApiListener "api" {
-  cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt"
-  key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key"
-  ca_path = SysconfDir + "/icinga2/pki/ca.crt"
-
-  ticket_salt = TicketSalt
-}

diff --git a/icinga2/features-available/api.conf.orig.2017-10-10 b/icinga2/features-available/api.conf.orig.2017-10-10
new file mode 100644 (file)
index 0000000..0136de0
--- /dev/null
+++ b/icinga2/features-available/api.conf.orig.2017-10-10
@@ -0,0 +1,11 @@
+/**
+ * The API listener is used for distributed monitoring setups.
+ */
+
+object ApiListener "api" {
+  cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt"
+  key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key"
+  ca_path = SysconfDir + "/icinga2/pki/ca.crt"
+
+  ticket_salt = TicketSalt
+}

diff --git a/icinga2/features-available/api.conf.orig.2017-11-16 b/icinga2/features-available/api.conf.orig.2017-11-16
new file mode 100644 (file)
index 0000000..b072a44
--- /dev/null
+++ b/icinga2/features-available/api.conf.orig.2017-11-16
@@ -0,0 +1,10 @@
+/**
+ * The API listener is used for distributed monitoring setups.
+ */
+
+object ApiListener "api" {
+  //accept_config = false
+  //accept_commands = false
+
+  ticket_salt = TicketSalt
+}