From e04c8530ca72177e23b06ea4a46583ff0691e3aa Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 9 Jul 2020 21:31:53 +0200 Subject: [PATCH] daily autocommit --- .etckeeper | 52 +++++++++++++++++-- apache2/sites-available/icinga.conf | 17 +++--- backup.log | 7 +++ default/locale | 2 +- icinga2/conf.d/api-users.conf | 9 ++++ icinga2/constants.conf | 4 +- icinga2/constants.conf.orig | 28 ++++++++++ icinga2/features-available/api.conf | 4 +- icinga2/features-available/ido-mysql.conf | 6 +-- icinga2/features-enabled/api.conf | 1 + icingaweb2/authentication.ini | 3 ++ icingaweb2/config.ini | 11 ++++ icingaweb2/enabledModules/director | 1 + icingaweb2/enabledModules/incubator | 1 + icingaweb2/enabledModules/ipl | 1 + icingaweb2/enabledModules/monitoring | 1 + icingaweb2/enabledModules/reactbundle | 1 + icingaweb2/groups.ini | 3 ++ icingaweb2/modules/director/config.ini | 2 + icingaweb2/modules/monitoring/backends.ini | 3 ++ .../modules/monitoring/commandtransports.ini | 6 +++ icingaweb2/modules/monitoring/config.ini | 2 + icingaweb2/resources.ini | 31 +++++++++++ icingaweb2/roles.ini | 4 ++ icingaweb2/setup.token | 1 - letsencrypt/csr/2009_csr-certbot.pem | 16 ++++++ letsencrypt/keys/2009_key-certbot.pem | 28 ++++++++++ locale.gen | 2 +- passwd | 1 + passwd- | 1 + shadow | 1 + systemd/system/icinga-director.service | 21 ++++++++ .../icinga-director.service | 1 + 33 files changed, 251 insertions(+), 21 deletions(-) create mode 100644 backup.log create mode 100644 icinga2/conf.d/api-users.conf create mode 100644 icinga2/constants.conf.orig create mode 120000 icinga2/features-enabled/api.conf create mode 100644 icingaweb2/authentication.ini create mode 100644 icingaweb2/config.ini create mode 120000 icingaweb2/enabledModules/director create mode 120000 icingaweb2/enabledModules/incubator create mode 120000 icingaweb2/enabledModules/ipl create mode 120000 icingaweb2/enabledModules/monitoring create mode 120000 icingaweb2/enabledModules/reactbundle create mode 100644 icingaweb2/groups.ini create mode 100644 icingaweb2/modules/director/config.ini create mode 100644 icingaweb2/modules/monitoring/backends.ini create mode 100644 icingaweb2/modules/monitoring/commandtransports.ini create mode 100644 icingaweb2/modules/monitoring/config.ini create mode 100644 icingaweb2/resources.ini create mode 100644 icingaweb2/roles.ini delete mode 100644 icingaweb2/setup.token create mode 100644 letsencrypt/csr/2009_csr-certbot.pem create mode 100644 letsencrypt/keys/2009_key-certbot.pem create mode 100644 systemd/system/icinga-director.service create mode 120000 systemd/system/multi-user.target.wants/icinga-director.service diff --git a/.etckeeper b/.etckeeper index 67175f790..7b14fd493 100755 --- a/.etckeeper +++ b/.etckeeper @@ -689,6 +689,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg' maybe chmod 0755 'avahi' maybe chmod 0755 'avahi/services' maybe chmod 0644 'avahi/services/phpmyadmin.service' +maybe chmod 0644 'backup.log' maybe chmod 0644 'bash.bashrc' maybe chmod 0644 'bash_completion' maybe chmod 0755 'bash_completion.d' @@ -1246,6 +1247,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' @@ -1281,7 +1285,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' @@ -1357,12 +1364,48 @@ maybe chmod 0750 'icinga2/zones.d' maybe chmod 0644 'icinga2/zones.d/README' maybe chgrp 'icingaweb2' 'icingaweb2' maybe chmod 2770 'icingaweb2' +maybe chown 'www-data' 'icingaweb2/authentication.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/authentication.ini' +maybe chmod 0660 'icingaweb2/authentication.ini' +maybe chown 'www-data' 'icingaweb2/config.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/config.ini' +maybe chmod 0660 'icingaweb2/config.ini' +maybe chown 'www-data' 'icingaweb2/enabledModules' +maybe chgrp 'icingaweb2' 'icingaweb2/enabledModules' +maybe chmod 2750 'icingaweb2/enabledModules' +maybe chown 'www-data' 'icingaweb2/groups.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/groups.ini' +maybe chmod 0660 'icingaweb2/groups.ini' maybe chgrp 'icingaweb2' 'icingaweb2/modules' maybe chmod 2770 'icingaweb2/modules' +maybe chown 'www-data' 'icingaweb2/modules/director' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/director' +maybe chmod 2770 'icingaweb2/modules/director' +maybe chown 'www-data' 'icingaweb2/modules/director/config.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/director/config.ini' +maybe chmod 0660 'icingaweb2/modules/director/config.ini' +maybe chown 'www-data' 'icingaweb2/modules/monitoring' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring' +maybe chmod 2770 'icingaweb2/modules/monitoring' +maybe chown 'www-data' 'icingaweb2/modules/monitoring/backends.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/backends.ini' +maybe chmod 0660 'icingaweb2/modules/monitoring/backends.ini' +maybe chown 'www-data' 'icingaweb2/modules/monitoring/commandtransports.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/commandtransports.ini' +maybe chmod 0660 'icingaweb2/modules/monitoring/commandtransports.ini' +maybe chown 'www-data' 'icingaweb2/modules/monitoring/config.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/config.ini' +maybe chmod 0660 'icingaweb2/modules/monitoring/config.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/translation' maybe chmod 0755 'icingaweb2/modules/translation' +maybe chgrp 'icingaweb2' 'icingaweb2/modules/translation/config.ini' maybe chmod 0644 'icingaweb2/modules/translation/config.ini' -maybe chgrp 'icingaweb2' 'icingaweb2/setup.token' -maybe chmod 0660 'icingaweb2/setup.token' +maybe chown 'www-data' 'icingaweb2/resources.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/resources.ini' +maybe chmod 0660 'icingaweb2/resources.ini' +maybe chown 'www-data' 'icingaweb2/roles.ini' +maybe chgrp 'icingaweb2' 'icingaweb2/roles.ini' +maybe chmod 0660 'icingaweb2/roles.ini' maybe chmod 0755 'icingweb2' maybe chmod 0755 'icingweb2/enabledModules' maybe chmod 0755 'init' @@ -3767,6 +3810,7 @@ maybe chmod 0644 'letsencrypt/csr/2005_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2006_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2007_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2008_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2009_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -5777,6 +5821,7 @@ maybe chmod 0600 'letsencrypt/keys/2005_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2006_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2007_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2008_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2009_key-certbot.pem' maybe chmod 0700 'letsencrypt/live' maybe chmod 0644 'letsencrypt/live/README' maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online' @@ -6367,6 +6412,7 @@ maybe chmod 0755 'systemd/system/default.target.wants' maybe chmod 0755 'systemd/system/emergency.target.wants' maybe chmod 0755 'systemd/system/getty.target.wants' maybe chmod 0755 'systemd/system/graphical.target.wants' +maybe chmod 0644 'systemd/system/icinga-director.service' maybe chmod 0755 'systemd/system/icinga2.service.d' maybe chmod 0644 'systemd/system/icinga2.service.d/limits.conf' maybe chmod 0755 'systemd/system/multi-user.target.wants' diff --git a/apache2/sites-available/icinga.conf b/apache2/sites-available/icinga.conf index 354772b0e..94666b463 100644 --- a/apache2/sites-available/icinga.conf +++ b/apache2/sites-available/icinga.conf @@ -16,15 +16,16 @@ EnableSendfile Off -# -# RewriteEngine on + + RewriteEngine on + RewriteCond %{HTTPS} off # RewriteBase /icingaweb2/ -# RewriteCond %{REQUEST_FILENAME} -s [OR] -# RewriteCond %{REQUEST_FILENAME} -l [OR] -# RewriteCond %{REQUEST_FILENAME} -d -# RewriteRule ^.*$ - [NC,L] -# RewriteRule ^.*$ index.php [NC,L] -# + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] + DirectoryIndex error_norewrite.html diff --git a/backup.log b/backup.log new file mode 100644 index 000000000..799a8e0b5 --- /dev/null +++ b/backup.log @@ -0,0 +1,7 @@ +###### Starting backup on Thu 09 Jul 2020 03:35:13 PM CEST ###### +/root/bin/borg_backup.sh: line 25: /root/backup/software.list: No such file or directory +/usr/local/sbin/backup_mysqldb.sh: line 6: syntax error near unexpected token `/usr/bin/mysqldump' +/usr/local/sbin/backup_mysqldb.sh: line 6: ` /usr/bin/mysqldump --no-defaults -u backup ${db} > ${BACKUPPATH}/mysqldump_${db}.sql' +Syncing backup files ... +Connection closed by remote host. Is borg working on the server? +###### Finished backup on Thu 09 Jul 2020 03:35:44 PM CEST ###### diff --git a/default/locale b/default/locale index 1f6661ea2..f14e2941c 100644 --- a/default/locale +++ b/default/locale @@ -1,2 +1,2 @@ # File generated by update-locale -LANG="en_US.UTF-8" +LANG=de_DE.UTF-8 diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf new file mode 100644 index 000000000..2b57ccd9d --- /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 "apiuser" { + password = "YxiVBdlIO8tHDDmr5QxZAeliaWU3S7" + // client_cn = "" + + permissions = [ "*" ] +} diff --git a/icinga2/constants.conf b/icinga2/constants.conf index 29232d618..45fe87935 100644 --- 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 = "mail.hoellein.online" /* Our local zone name. */ -const ZoneName = NodeName +const ZoneName = "mail.hoellein.online" /* Secret key for remote node tickets */ const TicketSalt = "" diff --git a/icinga2/constants.conf.orig b/icinga2/constants.conf.orig new file mode 100644 index 000000000..29232d618 --- /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-available/api.conf b/icinga2/features-available/api.conf index b072a4406..588ad54f9 100644 --- a/icinga2/features-available/api.conf +++ b/icinga2/features-available/api.conf @@ -3,8 +3,8 @@ */ object ApiListener "api" { - //accept_config = false - //accept_commands = false + accept_config = true + accept_commands = true ticket_salt = TicketSalt } diff --git a/icinga2/features-available/ido-mysql.conf b/icinga2/features-available/ido-mysql.conf index 07b9fad12..70f2169f7 100644 --- a/icinga2/features-available/ido-mysql.conf +++ b/icinga2/features-available/ido-mysql.conf @@ -6,9 +6,9 @@ library "db_ido_mysql" object IdoMysqlConnection "ido-mysql" { - user = "icingaweb2", - password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q", + user = "icinga_ido", + password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q", host = "localhost", - database = "icingaweb2" + database = "icinga_ido" } diff --git a/icinga2/features-enabled/api.conf b/icinga2/features-enabled/api.conf new file mode 120000 index 000000000..8cdce62b6 --- /dev/null +++ b/icinga2/features-enabled/api.conf @@ -0,0 +1 @@ +../features-available/api.conf \ No newline at end of file diff --git a/icingaweb2/authentication.ini b/icingaweb2/authentication.ini new file mode 100644 index 000000000..ad8706a49 --- /dev/null +++ b/icingaweb2/authentication.ini @@ -0,0 +1,3 @@ +[icingaweb2] +backend = "db" +resource = "icingaweb2_db" diff --git a/icingaweb2/config.ini b/icingaweb2/config.ini new file mode 100644 index 000000000..422b0cfe7 --- /dev/null +++ b/icingaweb2/config.ini @@ -0,0 +1,11 @@ +[global] +show_stacktraces = "1" +show_application_state_messages = "1" +config_backend = "db" +config_resource = "icingaweb2_db" + +[logging] +log = "syslog" +level = "ERROR" +application = "icingaweb2" +facility = "user" diff --git a/icingaweb2/enabledModules/director b/icingaweb2/enabledModules/director new file mode 120000 index 000000000..d18c77384 --- /dev/null +++ b/icingaweb2/enabledModules/director @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/director \ No newline at end of file diff --git a/icingaweb2/enabledModules/incubator b/icingaweb2/enabledModules/incubator new file mode 120000 index 000000000..10f8549a9 --- /dev/null +++ b/icingaweb2/enabledModules/incubator @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/incubator \ No newline at end of file diff --git a/icingaweb2/enabledModules/ipl b/icingaweb2/enabledModules/ipl new file mode 120000 index 000000000..09b5ab2cf --- /dev/null +++ b/icingaweb2/enabledModules/ipl @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/ipl \ No newline at end of file diff --git a/icingaweb2/enabledModules/monitoring b/icingaweb2/enabledModules/monitoring new file mode 120000 index 000000000..c201d0027 --- /dev/null +++ b/icingaweb2/enabledModules/monitoring @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/monitoring \ No newline at end of file diff --git a/icingaweb2/enabledModules/reactbundle b/icingaweb2/enabledModules/reactbundle new file mode 120000 index 000000000..fd5490955 --- /dev/null +++ b/icingaweb2/enabledModules/reactbundle @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/reactbundle \ No newline at end of file diff --git a/icingaweb2/groups.ini b/icingaweb2/groups.ini new file mode 100644 index 000000000..ad8706a49 --- /dev/null +++ b/icingaweb2/groups.ini @@ -0,0 +1,3 @@ +[icingaweb2] +backend = "db" +resource = "icingaweb2_db" diff --git a/icingaweb2/modules/director/config.ini b/icingaweb2/modules/director/config.ini new file mode 100644 index 000000000..ef128e597 --- /dev/null +++ b/icingaweb2/modules/director/config.ini @@ -0,0 +1,2 @@ +[db] +resource = "director" diff --git a/icingaweb2/modules/monitoring/backends.ini b/icingaweb2/modules/monitoring/backends.ini new file mode 100644 index 000000000..702a1a412 --- /dev/null +++ b/icingaweb2/modules/monitoring/backends.ini @@ -0,0 +1,3 @@ +[icinga] +type = "ido" +resource = "icinga_ido" diff --git a/icingaweb2/modules/monitoring/commandtransports.ini b/icingaweb2/modules/monitoring/commandtransports.ini new file mode 100644 index 000000000..70e521312 --- /dev/null +++ b/icingaweb2/modules/monitoring/commandtransports.ini @@ -0,0 +1,6 @@ +[icinga2] +transport = "api" +host = "localhost" +port = "5665" +username = "root" +password = "f54ab8dedcb07c45" diff --git a/icingaweb2/modules/monitoring/config.ini b/icingaweb2/modules/monitoring/config.ini new file mode 100644 index 000000000..9b69fe86f --- /dev/null +++ b/icingaweb2/modules/monitoring/config.ini @@ -0,0 +1,2 @@ +[security] +protected_customvars = "*pw*,*pass*,community" diff --git a/icingaweb2/resources.ini b/icingaweb2/resources.ini new file mode 100644 index 000000000..1ca208f8e --- /dev/null +++ b/icingaweb2/resources.ini @@ -0,0 +1,31 @@ +[icingaweb2_db] +type = "db" +db = "mysql" +host = "localhost" +port = "" +dbname = "icingaweb2" +username = "icingaweb2" +password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q" +charset = "UTF8" +use_ssl = "0" + +[icinga_ido] +type = "db" +db = "mysql" +host = "localhost" +port = "" +dbname = "icinga_ido" +username = "icinga_ido" +password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q" +charset = "UTF8" +use_ssl = "0" + +[director] +type = "db" +db = "mysql" +host = "localhost" +dbname = "icinga2director" +username = "director" +password = "cGtbWBBEs1zLXBQbI8MoR17nL" +charset = "utf8" +use_ssl = "0" diff --git a/icingaweb2/roles.ini b/icingaweb2/roles.ini new file mode 100644 index 000000000..61ab18a4c --- /dev/null +++ b/icingaweb2/roles.ini @@ -0,0 +1,4 @@ +[Administrators] +users = "admin" +permissions = "*" +groups = "Administrators" diff --git a/icingaweb2/setup.token b/icingaweb2/setup.token deleted file mode 100644 index 0a53d6073..000000000 --- a/icingaweb2/setup.token +++ /dev/null @@ -1 +0,0 @@ -6d5de861e6d117ff \ No newline at end of file diff --git a/letsencrypt/csr/2009_csr-certbot.pem b/letsencrypt/csr/2009_csr-certbot.pem new file mode 100644 index 000000000..26340f22f --- /dev/null +++ b/letsencrypt/csr/2009_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkK +cRYerdxeoBFXzxT5ccm67cP8Qg5+UWOj/7VCJlCtKk/5dhs8rBkRZjpQ0lmEoeoQ +cvfr8hb9RldoiSjAk6tVw84ybZQI5zXTL09fpAnFe51Q6P3jT1GlYWGjpgh3Gu0m +X2kPxk9Gp+CptY7CO/Mfm0IuhlrFf8EnlHXr4P6nqcuc0/aoHXm8GX3KhaPJLjDS +LHXkVoLHDP8z2ozzot+6/eC05xdJ17SDgWdEtq3/kwvYBrOFyZcKBLClylEDpGxG +FShLVZuZ8lFkE5g/ipsnyHtx0CM5TZ/JsMRiqu9Tg+Bypl0p41wveMnnxPSFYGHX +P+NOZ7wRlDbDrvoW/bsCAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw +EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCCvi/KNejMuC+h +6gpb9nbdjBcvtxtHLJyvzZYoGsoOOjJQ/67avpBbk9sxoi1Rbw4TyGqMgE+VDGvB +5bjvmZw8mPujL/QYQG0+mUYYb5r/rP7EmAYedG2TljXHvg2toCDgl2xctQTj9Fai +lOkx1O9L++bJfWGuT6NQf3IVmHbOxkmLmFYeg7ESyFLJ40kdtWTDpQNQkGdul9Lx +oi6JvKr/wNUY0oT8KiNFAiUxwQTS0eD3Y07KP3GDu+WR+NfaI9uNvVDPJAW8oGCB ++RSf65ZO0zP9a1mnZleD0t4IweeBDNpZ+XOCTLcz5nR9DQrc0McW4NiijH8ZCSlZ +pv50G2Mn +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/2009_key-certbot.pem b/letsencrypt/keys/2009_key-certbot.pem new file mode 100644 index 000000000..9ca78b3cc --- /dev/null +++ b/letsencrypt/keys/2009_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5CnEWHq3cXqAR +V88U+XHJuu3D/EIOflFjo/+1QiZQrSpP+XYbPKwZEWY6UNJZhKHqEHL36/IW/UZX +aIkowJOrVcPOMm2UCOc10y9PX6QJxXudUOj9409RpWFho6YIdxrtJl9pD8ZPRqfg +qbWOwjvzH5tCLoZaxX/BJ5R16+D+p6nLnNP2qB15vBl9yoWjyS4w0ix15FaCxwz/ +M9qM86Lfuv3gtOcXSde0g4FnRLat/5ML2AazhcmXCgSwpcpRA6RsRhUoS1WbmfJR +ZBOYP4qbJ8h7cdAjOU2fybDEYqrvU4PgcqZdKeNcL3jJ58T0hWBh1z/jTme8EZQ2 +w676Fv27AgMBAAECggEAVRLS6VuTjbTHnRGk+Lyyrw/NTwUEjctPuiLlZr2SBheH +U5uazGz5ptDUEk2kWFndY1LKuOd2t1Ec7QT3wo+/lM9qpbuTm7L4Mkv0/WY4cfGk +orBXXpsKlbwWaKCnrk6sR4oT5abGAx62AlmkSo1MqLvIUwY26TbSRMjgvdKD8C/3 +AZs52WVXyOKcFGjqYFz/f8Ym9SVDNWGONeOrYeV+UQOu49B2XCQYQ+80YuvD8lsD +JHGU/I6SmWvKM+EVSlDocFs3cJ5spWSTtA6HSCwq0qpZdr0o8WP/I+nR5nRkgDE5 +R6I+3ZCGyUa534H+t2m8gIrsMxL43Btx98kbD61JIQKBgQDpvCn8jEfeutqZyukV +lE95RRIdO0pX3wD0NFe2tgfqg1op0yURv44HOU6pH9jhmsHUxewXrrRdBGaZMj9C +8TmqD/DyZv8GklpTk/kVW7mMWUyNTt5nNdItFuD9rX+tnK4Np4R3KogsrQEDOGEu +ut8zhmokjBv3s6dTNMy1cNEWcQKBgQDKqtNjh7Y5tsN7X765VGBufTNA8kNDGvyJ +ImOeXg3uxDPD3zY/Yzd5PeBqQG+fbc2Jq0i1eP/SGlQRep4EKdg+x1HvNbbxVS1t +x3vn/u4uusx9NMLJnklTh6s7HJxTpelpIYKkr3AilpBEQRwpPZQ7XcfBW2a0/wHT +exPyvbek6wKBgFTdJ9V1TYb2Cva58KUQI0bhqDEK3PRImL0R4CMLtpYUOQFkk1n9 +VeETkpbfZEyNdwD9F7qFiSEYvvOyhbuVgB1aCl7IvKGzM66S1GZH1ne52IyZ7TBG +H1iVrP0OKIRtldiJURQ/Ug/+hJaZutdPrEi17gX1BRaLmR4h1o2uN4xRAoGAZx9i +7nsIkvdXInjGcEDpzG6yXLKo3QVnSFQSQmvzRPHasSjrzncqq+t7PDVLVuElO47H +MWe/K+YvrrEopE+yc8cx/rjjPIst0XU2rAaApZBxKqhlEPgUsYcP7sURGlMKoG7n +reqC8WaRQ9mpfaaSvV5rnQxoB2LWSAiRTuuP/T8CgYEAuK9s/4LPHy+c/o6xE1Bn +0TimDkbB6yZSgISMRdUPkaxWZIke3VkS9GGU5kCoQ+kf8WPERk2rJIRw4cts+TdN +2jINVwdXuXIxQB8C8M9BTGwZhk3cCnubPCWIDELcQbROUlkV536+Kx+M/w5VAYzu +poikSFe6menZpZEw3iFZrwg= +-----END PRIVATE KEY----- diff --git a/locale.gen b/locale.gen index 98f6d0bbc..7fd2336b4 100644 --- a/locale.gen +++ b/locale.gen @@ -114,7 +114,7 @@ # de_CH ISO-8859-1 # de_CH.UTF-8 UTF-8 # de_DE ISO-8859-1 -# de_DE.UTF-8 UTF-8 +de_DE.UTF-8 UTF-8 # de_DE@euro ISO-8859-15 # de_IT ISO-8859-1 # de_IT.UTF-8 UTF-8 diff --git a/passwd b/passwd index ba540ab52..953b0ef08 100644 --- a/passwd +++ b/passwd @@ -42,3 +42,4 @@ systemd-timesync:x:120:125:systemd Time Synchronization,,,:/run/systemd:/usr/sbi tcpdump:x:121:128::/nonexistent:/usr/sbin/nologin systemd-coredump:x:999:999:systemd Core Dumper:/:/usr/sbin/nologin nagios:x:122:129::/var/lib/nagios:/usr/sbin/nologin +icingadirector:x:998:130::/var/lib/icingadirector:/bin/false diff --git a/passwd- b/passwd- index ef2cf3be0..ba540ab52 100644 --- a/passwd- +++ b/passwd- @@ -41,3 +41,4 @@ policyd-spf:x:119:124::/nonexistent:/usr/sbin/nologin systemd-timesync:x:120:125:systemd Time Synchronization,,,:/run/systemd:/usr/sbin/nologin tcpdump:x:121:128::/nonexistent:/usr/sbin/nologin systemd-coredump:x:999:999:systemd Core Dumper:/:/usr/sbin/nologin +nagios:x:122:129::/var/lib/nagios:/usr/sbin/nologin diff --git a/shadow b/shadow index e2d7f7f04..7fef693c6 100644 --- a/shadow +++ b/shadow @@ -42,3 +42,4 @@ systemd-timesync:*:18450:0:99999:7::: tcpdump:*:18450:0:99999:7::: systemd-coredump:!!:18450:::::: nagios:!:18451:0:99999:7::: +icingadirector:!:18452:::::: diff --git a/systemd/system/icinga-director.service b/systemd/system/icinga-director.service new file mode 100644 index 000000000..f96f1d717 --- /dev/null +++ b/systemd/system/icinga-director.service @@ -0,0 +1,21 @@ +[Unit] +Description=Icinga Director - Monitoring Configuration +Documentation=https://icinga.com/docs/director/latest/ +Wants=network.target + +[Service] +EnvironmentFile=-/etc/default/icinga-director +EnvironmentFile=-/etc/sysconfig/icinga-director +ExecStart=/usr/bin/icingacli director daemon run +ExecReload=/bin/kill -HUP ${MAINPID} +User=icingadirector +SyslogIdentifier=icingadirector +Type=notify + +NotifyAccess=main +WatchdogSec=10 +RestartSec=30 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/multi-user.target.wants/icinga-director.service b/systemd/system/multi-user.target.wants/icinga-director.service new file mode 120000 index 000000000..52e7fd2a8 --- /dev/null +++ b/systemd/system/multi-user.target.wants/icinga-director.service @@ -0,0 +1 @@ +/etc/systemd/system/icinga-director.service \ No newline at end of file -- 2.43.0