From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 22 Nov 2017 05:40:00 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6d77b0f5fe675b5122c74e1c6fdf807710e1e30d;p=config%2Fns1%2Fetc.git

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index 1a0aaeb..e238d18 100755
--- 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 28bf922..588ad54 100644
--- 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
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
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
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
+}