From: mhoellein <mario@hoellein.online>
Date: Fri, 4 Jun 2021 07:50:42 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=7504d709dc145fd7e174210c90f0912ac8193de8;p=vserver

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

diff --git a/.etckeeper b/.etckeeper
index 8b52d90c0..714da6356 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -685,6 +685,7 @@ maybe chmod 0644 'apt/sources.list.bak2'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/apache2.list'
 maybe chmod 0644 'apt/sources.list.d/apache2.list.distUpgrade'
+maybe chmod 0644 'apt/sources.list.d/focal-icinga.list'
 maybe chmod 0644 'apt/sources.list.d/webmin.list'
 maybe chmod 0644 'apt/sources.list.d/webmin.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.distUpgrade'
diff --git a/apt/sources.list b/apt/sources.list
index 0c9ea689e..1043b7f26 100644
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -53,7 +53,3 @@ deb http://security.ubuntu.com/ubuntu focal-security universe
 deb http://security.ubuntu.com/ubuntu focal-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu bionic-security multiverse
 deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu2004 ./
-
-deb http://packages.icinga.com/ubuntu icinga-focal main
-deb-src http://packages.icinga.com/ubuntu icinga-focal main
-
diff --git a/apt/sources.list.d/focal-icinga.list b/apt/sources.list.d/focal-icinga.list
new file mode 100644
index 000000000..0132c461d
--- /dev/null
+++ b/apt/sources.list.d/focal-icinga.list
@@ -0,0 +1,2 @@
+deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] http://packages.icinga.com/ubuntu icinga-focal main
+deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] http://packages.icinga.com/ubuntu icinga-focal main
diff --git a/icingaweb2/enabledModules/graphite b/icingaweb2/enabledModules/graphite
deleted file mode 120000
index 798361df1..000000000
--- a/icingaweb2/enabledModules/graphite
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icingaweb2/modules/graphite
\ No newline at end of file
diff --git a/icingaweb2/resources.ini b/icingaweb2/resources.ini
index 1ca208f8e..61d41894d 100644
--- a/icingaweb2/resources.ini
+++ b/icingaweb2/resources.ini
@@ -1,31 +1,29 @@
-[icingaweb2_db]
+[director]
 type = "db"
 db = "mysql"
 host = "localhost"
-port = ""
-dbname = "icingaweb2"
-username = "icingaweb2"
-password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q"
-charset = "UTF8"
+dbname = "icinga2director"
+username = "director"
+password = "cGtbWBBEs1zLXBQbI8MoR17nL"
+charset = "utf8"
 use_ssl = "0"
 
 [icinga_ido]
 type = "db"
 db = "mysql"
 host = "localhost"
-port = ""
 dbname = "icinga_ido"
 username = "icinga_ido"
 password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q"
-charset = "UTF8"
+charset = "utf8"
 use_ssl = "0"
 
-[director]
+[icingaweb2_db]
 type = "db"
 db = "mysql"
 host = "localhost"
-dbname = "icinga2director"
-username = "director"
-password = "cGtbWBBEs1zLXBQbI8MoR17nL"
+dbname = "icingaweb2"
+username = "icingaweb2"
+password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q"
 charset = "utf8"
 use_ssl = "0"