saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 311aaffeba61a6556f2e12313a4ca9788c9fa0d1..600661c9e4182f40d11fb656e5af7f4d632f546b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2738,6 +2738,9 @@ maybe chmod 0750 'icinga2'
 maybe chown 'nagios' 'icinga2/conf.d'
 maybe chgrp 'nagios' 'icinga2/conf.d'
 maybe chmod 0750 'icinga2/conf.d'
+maybe chown 'nagios' 'icinga2/conf.d/api-users.conf'
+maybe chgrp 'nagios' 'icinga2/conf.d/api-users.conf'
+maybe chmod 0644 'icinga2/conf.d/api-users.conf'
 maybe chown 'nagios' 'icinga2/conf.d/app.conf'
 maybe chgrp 'nagios' 'icinga2/conf.d/app.conf'
 maybe chmod 0644 'icinga2/conf.d/app.conf'
@@ -2773,7 +2776,10 @@ maybe chgrp 'nagios' 'icinga2/conf.d/users.conf'
 maybe chmod 0644 'icinga2/conf.d/users.conf'
 maybe chown 'nagios' 'icinga2/constants.conf'
 maybe chgrp 'nagios' 'icinga2/constants.conf'
-maybe chmod 0640 'icinga2/constants.conf'
+maybe chmod 0644 'icinga2/constants.conf'
+maybe chown 'nagios' 'icinga2/constants.conf.orig'
+maybe chgrp 'nagios' 'icinga2/constants.conf.orig'
+maybe chmod 0640 'icinga2/constants.conf.orig'
 maybe chown 'nagios' 'icinga2/features-available'
 maybe chgrp 'nagios' 'icinga2/features-available'
 maybe chmod 0750 'icinga2/features-available'

diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf
new file mode 100644 (file)
index 0000000..fdfd3d7
--- /dev/null
+++ b/icinga2/conf.d/api-users.conf
@@ -0,0 +1,9 @@
+/**
+ * The ApiUser objects are used for authentication against the API.
+ */
+object ApiUser "root" {
+  password = "1c792f53515736aa"
+  // client_cn = ""
+
+  permissions = [ "*" ]
+}

diff --git a/icinga2/constants.conf b/icinga2/constants.conf
index 29232d618e56f5e33de9e462583c3802e9e8a62d..5df1e29d470df837371056be53332797c57fe99e 100644 (file)
--- a/icinga2/constants.conf
+++ b/icinga2/constants.conf
@@ -19,10 +19,10 @@ const PluginContribDir = "/usr/lib/nagios/plugins"
 /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
  * This should be the common name from the API certificate.
  */
-//const NodeName = "localhost"
+const NodeName = "homeserver"
 
 /* Our local zone name. */
-const ZoneName = NodeName
+const ZoneName = "homeserver"
 
 /* Secret key for remote node tickets */
 const TicketSalt = ""

diff --git a/icinga2/constants.conf.orig b/icinga2/constants.conf.orig
new file mode 100644 (file)
index 0000000..29232d6
--- /dev/null
+++ b/icinga2/constants.conf.orig
@@ -0,0 +1,28 @@
+/**
+ * This file defines global constants which can be used in
+ * the other configuration files.
+ */
+
+/* The directory which contains the plugins from the Monitoring Plugins project. */
+const PluginDir = "/usr/lib/nagios/plugins"
+
+/* The directory which contains the Manubulon plugins.
+ * Check the documentation, chapter "SNMP Manubulon Plugin Check Commands", for details.
+ */
+const ManubulonPluginDir = "/usr/lib/nagios/plugins"
+
+/* The directory which you use to store additional plugins which ITL provides user contributed command definitions for.
+ * Check the documentation, chapter "Plugins Contribution", for details.
+ */
+const PluginContribDir = "/usr/lib/nagios/plugins"
+
+/* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
+ * This should be the common name from the API certificate.
+ */
+//const NodeName = "localhost"
+
+/* Our local zone name. */
+const ZoneName = NodeName
+
+/* Secret key for remote node tickets */
+const TicketSalt = ""

diff --git a/icinga2/features-enabled/api.conf b/icinga2/features-enabled/api.conf
new file mode 120000 (symlink)
index 0000000..8cdce62
--- /dev/null
+++ b/icinga2/features-enabled/api.conf
@@ -0,0 +1 @@
+../features-available/api.conf
\ No newline at end of file