From: mhoellein <mhoellein@freenet.de>
Date: Fri, 10 Jul 2020 10:48:49 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=da0797f83aa62be204d256954079d608c6481256;p=homeserver

committing changes in /etc after apt run

Package changes:
-icinga2-ido-mysql 2.11.4-1.bionic amd64
---

diff --git a/.etckeeper b/.etckeeper
index 311aaffe..33a1f7fa 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -2085,7 +2085,6 @@ maybe chmod 0644 'davfs2/davfs2.conf'
 maybe chmod 0600 'davfs2/secrets'
 maybe chmod 0755 'dbconfig-common'
 maybe chmod 0600 'dbconfig-common/config'
-maybe chmod 0600 'dbconfig-common/icinga2-ido-mysql.conf'
 maybe chmod 0600 'dbconfig-common/phpmyadmin.conf'
 maybe chmod 0755 'dbus-1'
 maybe chmod 0755 'dbus-1/session.d'
@@ -2801,9 +2800,6 @@ maybe chmod 0644 'icinga2/features-available/gelf.conf'
 maybe chown 'nagios' 'icinga2/features-available/graphite.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/graphite.conf'
 maybe chmod 0644 'icinga2/features-available/graphite.conf'
-maybe chown 'nagios' 'icinga2/features-available/ido-mysql.conf'
-maybe chgrp 'nagios' 'icinga2/features-available/ido-mysql.conf'
-maybe chmod 0600 'icinga2/features-available/ido-mysql.conf'
 maybe chown 'nagios' 'icinga2/features-available/influxdb.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/influxdb.conf'
 maybe chmod 0644 'icinga2/features-available/influxdb.conf'
diff --git a/dbconfig-common/icinga2-ido-mysql.conf b/dbconfig-common/icinga2-ido-mysql.conf
deleted file mode 100644
index dcf0caa5..00000000
--- a/dbconfig-common/icinga2-ido-mysql.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-# automatically generated by the maintainer scripts of icinga2-ido-mysql
-# any changes you make will be preserved, though your comments
-# will be lost!  to change your settings you should edit this
-# file and then run "dpkg-reconfigure icinga2-ido-mysql"
-
-# dbc_install: configure database with dbconfig-common?
-#              set to anything but "true" to opt out of assistance
-dbc_install='false'
-
-# dbc_upgrade: upgrade database with dbconfig-common?
-#              set to anything but "true" to opt out of assistance
-dbc_upgrade='true'
-
-# dbc_remove: deconfigure database with dbconfig-common?
-#             set to anything but "true" to opt out of assistance
-dbc_remove='true'
-
-# dbc_dbtype: type of underlying database to use
-#	this exists primarily to let dbconfig-common know what database
-#	type to use when a package supports multiple database types.
-#	don't change this value unless you know for certain that this
-#	package supports multiple database types
-dbc_dbtype='mysql'
-
-# dbc_dbuser: database user
-#	the name of the user who we will use to connect to the database.
-dbc_dbuser='icinga2'
-
-# dbc_dbpass: database user password
-#	the password to use with the above username when connecting
-#	to a database, if one is required
-dbc_dbpass='vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q'
-
-# dbc_dballow: allowed host to connect from
-#       only for database types that support specifying the host from
-#       which the database user is allowed to connect from
-#       this string defines for which host the dbc_dbuser is allowed
-#       to connect
-#       this value is only really used again when you reconfigure the
-#       package
-dbc_dballow='localhost'
-
-# dbc_dbserver: database host.
-#	leave unset to use localhost (or a more efficient local method
-#	if it exists).
-dbc_dbserver='localhost'
-
-# dbc_dbport: remote database port
-#	leave unset to use the default.  only applicable if you are
-#	using a remote database.
-dbc_dbport='3306'
-
-# dbc_dbname: name of database
-#	this is the name of your application's database.
-dbc_dbname='icinga2'
-
-# dbc_dbadmin: name of the administrative user
-#	this is the administrative user that is used to create all of the above
-#	The exception is the MySQL/MariaDB localhost case, where this value is
-#	ignored and instead is determined from /etc/mysql/debian.cnf.
-dbc_dbadmin='debian-sys-maint'
-
-# dbc_basepath: base directory to hold database files
-#	leave unset to use the default.  only applicable if you are
-#	using a local (filesystem based) database.
-dbc_basepath=''
-
-##
-## postgresql specific settings.  if you don't use postgresql,
-## you can safely ignore all of these
-##
-
-# dbc_ssl: should we require ssl?
-#	set to "true" to require that connections use ssl
-dbc_ssl=''
-
-# dbc_authmethod_admin: authentication method for admin
-# dbc_authmethod_user: authentication method for dbuser
-#	see the section titled "AUTHENTICATION METHODS" in
-#	/usr/share/doc/dbconfig-common/README.pgsql for more info
-dbc_authmethod_admin=''
-dbc_authmethod_user=''
-
-##
-## end postgresql specific settings
-##
-
diff --git a/icinga2/features-available/ido-mysql.conf b/icinga2/features-available/ido-mysql.conf
deleted file mode 100644
index d3177057..00000000
--- a/icinga2/features-available/ido-mysql.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * The db_ido_mysql library implements IDO functionality
- * for MySQL.
- */
-
-library "db_ido_mysql"
-
-object IdoMysqlConnection "ido-mysql" {
-  user = "icinga2",
-  password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q",
-  host = "localhost",
-  database = "icinga2"
-}
-
diff --git a/icinga2/features-enabled/ido-mysql.conf b/icinga2/features-enabled/ido-mysql.conf
deleted file mode 120000
index c3e04f7f..00000000
--- a/icinga2/features-enabled/ido-mysql.conf
+++ /dev/null
@@ -1 +0,0 @@
-../features-available/ido-mysql.conf
\ No newline at end of file