From: mhoellein <mario@hoellein.online>
Date: Wed, 8 Jul 2020 21:13:10 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=f8e6dbdf67fb88682f53bcc2837637a7621c5c4a;p=vserver

saving uncommitted changes in /etc prior to apt run
---

diff --git a/.etckeeper b/.etckeeper
index 180df5194..ed7cd4d8e 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1265,6 +1265,7 @@ maybe chmod 0644 'icinga2/features-available/debuglog.conf'
 maybe chmod 0644 'icinga2/features-available/elasticsearch.conf'
 maybe chmod 0644 'icinga2/features-available/gelf.conf'
 maybe chmod 0644 'icinga2/features-available/graphite.conf'
+maybe chmod 0644 'icinga2/features-available/ido-mysql.conf'
 maybe chmod 0644 'icinga2/features-available/influxdb.conf'
 maybe chmod 0644 'icinga2/features-available/livestatus.conf'
 maybe chmod 0644 'icinga2/features-available/mainlog.conf'
diff --git a/group b/group
index 4b42c368e..5f74522d0 100644
--- a/group
+++ b/group
@@ -70,3 +70,4 @@ tcpdump:x:128:
 systemd-coredump:x:999:
 nagios:x:129:
 icingaweb2:x:130:www-data
+icingacmd:x:131:www-data
diff --git a/group- b/group-
index 5209d4d57..8ab608f69 100644
--- a/group-
+++ b/group-
@@ -69,4 +69,5 @@ render:x:127:
 tcpdump:x:128:
 systemd-coredump:x:999:
 nagios:x:129:
-icingaweb2:x:130:
+icingaweb2:x:130:www-data
+icingacmd:x:131:
diff --git a/gshadow b/gshadow
index b3f7ae3af..11e3d74fc 100644
--- a/gshadow
+++ b/gshadow
@@ -70,3 +70,4 @@ tcpdump:!::
 systemd-coredump:!!::
 nagios:!::
 icingaweb2:!::www-data
+icingacmd:!::www-data
diff --git a/gshadow- b/gshadow-
index fe78f0510..f5bd242c6 100644
--- a/gshadow-
+++ b/gshadow-
@@ -69,4 +69,5 @@ render:!::
 tcpdump:!::
 systemd-coredump:!!::
 nagios:!::
-icingaweb2:!::
+icingaweb2:!::www-data
+icingacmd:!::
diff --git a/icinga2/features-available/ido-mysql.conf b/icinga2/features-available/ido-mysql.conf
new file mode 100644
index 000000000..07b9fad12
--- /dev/null
+++ b/icinga2/features-available/ido-mysql.conf
@@ -0,0 +1,14 @@
+/**
+ * The db_ido_mysql library implements IDO functionality
+ * for MySQL.
+ */
+
+library "db_ido_mysql"
+
+object IdoMysqlConnection "ido-mysql" {
+  user = "icingaweb2",
+  password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q",
+  host = "localhost",
+  database = "icingaweb2"
+}
+
diff --git a/icinga2/features-enabled/command.conf b/icinga2/features-enabled/command.conf
new file mode 120000
index 000000000..42924bcc7
--- /dev/null
+++ b/icinga2/features-enabled/command.conf
@@ -0,0 +1 @@
+../features-available/command.conf
\ No newline at end of file
diff --git a/icinga2/features-enabled/ido-mysql.conf b/icinga2/features-enabled/ido-mysql.conf
new file mode 120000
index 000000000..c3e04f7fe
--- /dev/null
+++ b/icinga2/features-enabled/ido-mysql.conf
@@ -0,0 +1 @@
+../features-available/ido-mysql.conf
\ No newline at end of file
diff --git a/icingaweb2/setup.token b/icingaweb2/setup.token
index 09ba1e25c..0a53d6073 100644
--- a/icingaweb2/setup.token
+++ b/icingaweb2/setup.token
@@ -1 +1 @@
-efa4ae68497204b8
\ No newline at end of file
+6d5de861e6d117ff
\ No newline at end of file