From a50eaf4424d093bb5284c4ee594edeef79eb0a65 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 22 Sep 2017 00:22:19 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 25 +++++++++++- icinga2/conf.d/api-users.conf | 9 +++++ icinga2/conf.d/hosts.conf | 46 ---------------------- icinga2/conf.d/ns1.conf | 51 +++++++++++++++++++++++++ icinga2/conf.d/{ => ns1}/apt.conf | 3 +- icinga2/conf.d/ns1/icinga.conf | 9 +++++ icinga2/conf.d/ns1/load.conf | 13 +++++++ icinga2/conf.d/ns1/procs.conf | 9 +++++ icinga2/conf.d/ns1/swap.conf | 9 +++++ icinga2/conf.d/ns1/users.conf | 9 +++++ icinga2/conf.d/services.conf | 63 ------------------------------- icinga2/conf.d/services/dns.conf | 27 +++++++++++++ icinga2/features-enabled/api.conf | 1 + icinga2/pki/ca.crt | 28 ++++++++++++++ icinga2/pki/ns1.uhu-banane.de.crt | 29 ++++++++++++++ icinga2/pki/ns1.uhu-banane.de.csr | 27 +++++++++++++ icinga2/pki/ns1.uhu-banane.de.key | 51 +++++++++++++++++++++++++ vim/vimrc.local | 1 + 18 files changed, 298 insertions(+), 112 deletions(-) create mode 100644 icinga2/conf.d/api-users.conf create mode 100644 icinga2/conf.d/ns1.conf rename icinga2/conf.d/{ => ns1}/apt.conf (74%) create mode 100644 icinga2/conf.d/ns1/icinga.conf create mode 100644 icinga2/conf.d/ns1/load.conf create mode 100644 icinga2/conf.d/ns1/procs.conf create mode 100644 icinga2/conf.d/ns1/swap.conf create mode 100644 icinga2/conf.d/ns1/users.conf create mode 100644 icinga2/conf.d/services/dns.conf create mode 120000 icinga2/features-enabled/api.conf create mode 100644 icinga2/pki/ca.crt create mode 100644 icinga2/pki/ns1.uhu-banane.de.crt create mode 100644 icinga2/pki/ns1.uhu-banane.de.csr create mode 100644 icinga2/pki/ns1.uhu-banane.de.key diff --git a/.etckeeper b/.etckeeper index 8276ee1..7b4a5b3 100755 --- a/.etckeeper +++ b/.etckeeper @@ -12,7 +12,6 @@ mkdir -p './console' mkdir -p './dbus-1/session.d' mkdir -p './dpkg/dpkg.cfg.d' mkdir -p './fail2ban/fail2ban.d' -mkdir -p './icinga2/pki' mkdir -p './initramfs-tools/conf.d' mkdir -p './initramfs-tools/hooks' mkdir -p './initramfs-tools/scripts/init-bottom' @@ -804,15 +803,25 @@ maybe chmod 0644 'icinga2-classicui/cgi.cfg' maybe chgrp 'www-data' 'icinga2-classicui/htpasswd.users' maybe chmod 0640 'icinga2-classicui/htpasswd.users' maybe chmod 0755 'icinga2/conf.d' +maybe chmod 0644 'icinga2/conf.d/api-users.conf' maybe chmod 0644 'icinga2/conf.d/app.conf' -maybe chmod 0644 'icinga2/conf.d/apt.conf' maybe chmod 0644 'icinga2/conf.d/commands.conf' maybe chmod 0644 'icinga2/conf.d/downtimes.conf' maybe chmod 0644 'icinga2/conf.d/groups.conf' maybe chmod 0644 'icinga2/conf.d/hosts.conf' maybe chmod 0644 'icinga2/conf.d/notifications.conf' +maybe chmod 0755 'icinga2/conf.d/ns1' +maybe chmod 0644 'icinga2/conf.d/ns1.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/apt.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/icinga.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/load.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/procs.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/swap.conf' +maybe chmod 0644 'icinga2/conf.d/ns1/users.conf' maybe chmod 0644 'icinga2/conf.d/satellite.conf' +maybe chmod 0755 'icinga2/conf.d/services' maybe chmod 0644 'icinga2/conf.d/services.conf' +maybe chmod 0644 'icinga2/conf.d/services/dns.conf' maybe chmod 0644 'icinga2/conf.d/templates.conf' maybe chmod 0644 'icinga2/conf.d/timeperiods.conf' maybe chmod 0644 'icinga2/conf.d/users.conf' @@ -839,6 +848,18 @@ maybe chmod 0644 'icinga2/init.conf' maybe chown 'nagios' 'icinga2/pki' maybe chgrp 'nagios' 'icinga2/pki' maybe chmod 0700 'icinga2/pki' +maybe chown 'nagios' 'icinga2/pki/ca.crt' +maybe chgrp 'nagios' 'icinga2/pki/ca.crt' +maybe chmod 0644 'icinga2/pki/ca.crt' +maybe chown 'nagios' 'icinga2/pki/ns1.uhu-banane.de.crt' +maybe chgrp 'nagios' 'icinga2/pki/ns1.uhu-banane.de.crt' +maybe chmod 0644 'icinga2/pki/ns1.uhu-banane.de.crt' +maybe chown 'nagios' 'icinga2/pki/ns1.uhu-banane.de.csr' +maybe chgrp 'nagios' 'icinga2/pki/ns1.uhu-banane.de.csr' +maybe chmod 0644 'icinga2/pki/ns1.uhu-banane.de.csr' +maybe chown 'nagios' 'icinga2/pki/ns1.uhu-banane.de.key' +maybe chgrp 'nagios' 'icinga2/pki/ns1.uhu-banane.de.key' +maybe chmod 0600 'icinga2/pki/ns1.uhu-banane.de.key' maybe chmod 0755 'icinga2/repository.d' maybe chmod 0644 'icinga2/repository.d/README' maybe chmod 0755 'icinga2/scripts' diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf new file mode 100644 index 0000000..022b8d5 --- /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 = "fe5ff0896bafec3e" + // client_cn = "" + + permissions = [ "*" ] +} diff --git a/icinga2/conf.d/hosts.conf b/icinga2/conf.d/hosts.conf index 0fe2efd..547cab8 100644 --- a/icinga2/conf.d/hosts.conf +++ b/icinga2/conf.d/hosts.conf @@ -15,50 +15,4 @@ * own description, e.g. "db-host-1". */ -object Host NodeName { - /* Import the default host template defined in `templates.conf`. */ - import "generic-host" - - /* Specify the address attributes for checks e.g. `ssh` or `http`. */ - address = "127.0.0.1" - address6 = "::1" - - /* Set custom attribute `os` for hostgroup assignment in `groups.conf`. */ - vars.os = "Linux" - - /* Define http vhost attributes for service apply rules in `services.conf`. */ - vars.http_vhosts["http"] = { - http_uri = "/" - } - /* Uncomment if you've sucessfully installed Icinga Web 2. */ - //vars.http_vhosts["Icinga Web 2"] = { - // http_uri = "/icingaweb2" - //} - - /* Define disks and attributes for service apply rules in `services.conf`. */ - vars.disks["disk"] = { - /* No parameters. */ - } - vars.disks["disk /"] = { - disk_partitions = "/" - } - vars.disks["disk /home"] = { - disk_partitions = "/home" - } - vars.disks["disk /tmp"] = { - disk_partitions = "/tmp" - } - vars.disks["disk /var"] = { - disk_partitions = "/var" - } - vars.disks["disk /var/backup"] = { - disk_partitions = "/var/backup" - } - - /* Define notification mail attributes for notification apply rules in `notifications.conf`. */ - vars.notification["mail"] = { - /* The UserGroup `icingaadmins` is defined in `users.conf`. */ - groups = [ "icingaadmins" ] - } -} diff --git a/icinga2/conf.d/ns1.conf b/icinga2/conf.d/ns1.conf new file mode 100644 index 0000000..f186637 --- /dev/null +++ b/icinga2/conf.d/ns1.conf @@ -0,0 +1,51 @@ + +object Host "ns1" { + /* Import the default host template defined in `templates.conf`. */ + import "generic-host" + + /* Specify the address attributes for checks e.g. `ssh` or `http`. */ + address = "185.48.118.128" + address6 = "2001:6f8:1db7::2" + + /* Set custom attribute `os` for hostgroup assignment in `groups.conf`. */ + vars.os = "Linux" + + # All about DNS server + vars.is_ns = true + vars.check_dns_domain = "uhu-banane.de" + + /* Define http vhost attributes for service apply rules in `services.conf`. */ + vars.http_vhosts["http"] = { + http_uri = "/" + } + /* Uncomment if you've sucessfully installed Icinga Web 2. */ + //vars.http_vhosts["Icinga Web 2"] = { + // http_uri = "/icingaweb2" + //} + + /* Define disks and attributes for service apply rules in `services.conf`. */ + vars.disks["disk"] = { + /* No parameters. */ + } + vars.disks["disk /"] = { + disk_partitions = "/" + } + vars.disks["disk /home"] = { + disk_partitions = "/home" + } + vars.disks["disk /tmp"] = { + disk_partitions = "/tmp" + } + vars.disks["disk /var"] = { + disk_partitions = "/var" + } + vars.disks["disk /var/backup"] = { + disk_partitions = "/var/backup" + } + + /* Define notification mail attributes for notification apply rules in `notifications.conf`. */ + vars.notification["mail"] = { + /* The UserGroup `icingaadmins` is defined in `users.conf`. */ + groups = [ "icingaadmins" ] + } +} diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/ns1/apt.conf similarity index 74% rename from icinga2/conf.d/apt.conf rename to icinga2/conf.d/ns1/apt.conf index bdf2acc..a8a63e0 100644 --- a/icinga2/conf.d/apt.conf +++ b/icinga2/conf.d/ns1/apt.conf @@ -4,5 +4,6 @@ apply Service "apt" { check_command = "apt" enable_notifications = false - assign where host.name == NodeName + assign where host.name == "ns1" + } diff --git a/icinga2/conf.d/ns1/icinga.conf b/icinga2/conf.d/ns1/icinga.conf new file mode 100644 index 0000000..3b7249b --- /dev/null +++ b/icinga2/conf.d/ns1/icinga.conf @@ -0,0 +1,9 @@ + +apply Service "icinga" { + import "generic-service" + + check_command = "icinga" + + assign where host.name == "ns1" +} + diff --git a/icinga2/conf.d/ns1/load.conf b/icinga2/conf.d/ns1/load.conf new file mode 100644 index 0000000..b16d6c3 --- /dev/null +++ b/icinga2/conf.d/ns1/load.conf @@ -0,0 +1,13 @@ + +apply Service "load" { + import "generic-service" + + check_command = "load" + + /* Used by the ScheduledDowntime apply rule in `downtimes.conf`. */ + vars.backup_downtime = "02:00-03:00" + + assign where host.name == "ns1" + +} + diff --git a/icinga2/conf.d/ns1/procs.conf b/icinga2/conf.d/ns1/procs.conf new file mode 100644 index 0000000..09dcd95 --- /dev/null +++ b/icinga2/conf.d/ns1/procs.conf @@ -0,0 +1,9 @@ + +apply Service "procs" { + import "generic-service" + + check_command = "procs" + + assign where host.name == "ns1" +} + diff --git a/icinga2/conf.d/ns1/swap.conf b/icinga2/conf.d/ns1/swap.conf new file mode 100644 index 0000000..6ccd390 --- /dev/null +++ b/icinga2/conf.d/ns1/swap.conf @@ -0,0 +1,9 @@ + +apply Service "swap" { + import "generic-service" + + check_command = "swap" + + assign where host.name == "ns1" +} + diff --git a/icinga2/conf.d/ns1/users.conf b/icinga2/conf.d/ns1/users.conf new file mode 100644 index 0000000..63d6dc7 --- /dev/null +++ b/icinga2/conf.d/ns1/users.conf @@ -0,0 +1,9 @@ + +apply Service "users" { + import "generic-service" + + check_command = "users" + + assign where host.name == "ns1" +} + diff --git a/icinga2/conf.d/services.conf b/icinga2/conf.d/services.conf index 0db2dc2..312b11e 100644 --- a/icinga2/conf.d/services.conf +++ b/icinga2/conf.d/services.conf @@ -70,68 +70,5 @@ apply Service for (disk => config in host.vars.disks) { vars += config } -apply Service "icinga" { - import "generic-service" - - check_command = "icinga" - - assign where host.name == NodeName -} - -apply Service "load" { - import "generic-service" - - check_command = "load" - - /* Used by the ScheduledDowntime apply rule in `downtimes.conf`. */ - vars.backup_downtime = "02:00-03:00" - - assign where host.name == NodeName -} - -apply Service "procs" { - import "generic-service" - - check_command = "procs" - - assign where host.name == NodeName -} - -#apply Service "proc named" { -# import "generic-service" -# -# check_command = "procs" -# vars.procs_argument = "/usr/sbin/named" -# vars.procs_ppid = 1 -# #vars.procs_warning = '1:1' -# #vars.procs_critical = '1:1' -# vars.procs_user = 'named' -# #vars = { -# # procs_argument = "/usr/sbin/named" -# # procs_ppid = 1 -# # procs_warning = '1:1' -# # procs_critical = '1:1' -# # procs_user = 'named' -# #} -# -# assign where host.name == NodeName -#} - -apply Service "swap" { - import "generic-service" - - check_command = "swap" - - assign where host.name == NodeName -} - -apply Service "users" { - import "generic-service" - - check_command = "users" - - assign where host.name == NodeName -} - diff --git a/icinga2/conf.d/services/dns.conf b/icinga2/conf.d/services/dns.conf new file mode 100644 index 0000000..048b441 --- /dev/null +++ b/icinga2/conf.d/services/dns.conf @@ -0,0 +1,27 @@ + +apply Service "proc named" { + import "generic-service" + #host_name = "ns1" + + check_command = "procs" + vars.procs_argument = "/usr/sbin/named" + vars.procs_ppid = 1 + vars.procs_warning = "1:1" + vars.procs_critical = "1:2" + vars.procs_user = "bind" + + assign where host.vars.is_ns == true +} + +apply Service "dns_authoritative" { + import "generic-service" + + check_command = "dns" + vars.dns_lookup = host.vars.check_dns_domain + vars.dns_server = host.address + vars.dns_authoritative = true + vars.dns_query_type = "SOA" + + assign where host.vars.is_ns == true && host.vars.check_dns_domain +} + diff --git a/icinga2/features-enabled/api.conf b/icinga2/features-enabled/api.conf new file mode 120000 index 0000000..8cdce62 --- /dev/null +++ b/icinga2/features-enabled/api.conf @@ -0,0 +1 @@ +../features-available/api.conf \ No newline at end of file diff --git a/icinga2/pki/ca.crt b/icinga2/pki/ca.crt new file mode 100644 index 0000000..486532f --- /dev/null +++ b/icinga2/pki/ca.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEyjCCArKgAwIBAgIVAKijaxOh/7oUys2n+iw+GHS+hLDbMA0GCSqGSIb3DQEB +CwUAMBQxEjAQBgNVBAMMCUljaW5nYSBDQTAeFw0xNzA5MjEyMDUxMjFaFw0zMjA5 +MTcyMDUxMjFaMBQxEjAQBgNVBAMMCUljaW5nYSBDQTCCAiIwDQYJKoZIhvcNAQEB +BQADggIPADCCAgoCggIBALH5Dn55tfqcZejKiu+g/Bd+Nm3I6Maa7iAskg9C9HEM +rg2FvJmJi+gSO25amjsZGTC+TnYxIwsWsIPYfDOsfrfkhb1uz5d+7jpJf9aEgVgW +LZXXxL27rAEnACIHZDdQVLiz3SGSFiiXvYWEatfzfZk47IHLA4aYwnCwW9+QI5q1 +a+M+IfdQPR3CLHCYy4H5v9OUNv2qD3zkA50xO9QPt/DVtOx0n2CrmOjUOSC62sNE +jEZ0QJM+rRT21Jf+EwcDJVu+QTGceu8/aQ2vjy24OGksPDufcLha5fkYmKghBFRV +5jXr5NAoYhwMiZNPaLE+Rj8Sz+pHB83yVgBupHrD5sRbuz706mMftCDr3HNuDi/K +NtNujYwbBTWufNYJE4u4tBnrmhZvJjOhhU6x0jRG1Sh75U/JICbgAAYvSZcNAU5/ +OxiUmgJsKk24M+6+lqnkBlhsPoK40U9zhGhO52ATVdfrrwV6PpPw+oepZm1HWfze +E09lLC7GgBedbHuVS2xQ/C1L0vAZYfuiUyYMmpw33pX5EpAsDeu2kPWLKC3QjUJH +GetmJZNypFUWFDkORRJZGq4hj3QeETJKGzU4++XzmMdAnUbDrg33zX+HwOTU1kJL +W/hQCamzeai2whNSSnfConObXQ/zLqn9pE5ZrGTdQPIGerzzxSJm3PXu6zqxMVZt +AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAEtp +xft6IvJgJNxHM1tIUAmbijmcu+Y4HGEZaAX4u18i7y/exXHTBbeqJ1dztLy/VSVa +At94TcdZyewnHa0BsRNILI52qXlcoPBV57RzV+0jTfkK9L9FnuaDDaAYI8vHAxsL +b0/wieQ3SCLtoJfVRGr3FObz0EtmedKGHpc7sPGYM88QY4iTYVKSFCvYvG4PpZAq +K+EIn/sRcm6RdfnQwZ8dZ5zNeeZ1DmKlre0+pxwzXDgbTX+eC5CRqKKEknraYIX6 +F1GVEmNUXt5hN4je9Blqfp4e1mbArqXarJtxF5srqI7Dc877dXI//dokC5sivThK +7pgpH9uaXv8QTUPEsQAAvra1thfPO3I8mrli/CrRThg6AoxMo2PeHu6nbkV4KGpj +UXSg2gxR4+xoezuuSnnl0rBKLhrSFfEAyzR7hdSlBCgthLnpH7AMRxbosaYHziqQ +DxZefpiF1vy2og+clbmrW0vyPdt6Bia2SDptWkdZWOG4vJzXqvGToaaaDpA4rrtY +B3Xuhqyoa+Qq0NXBBpQUwPRceGrtehNgTGDokl6LExjI7h075TrWqTg3cc9LCmWf +ShJpM5SpZxcGnHZTpZ5Sm4CatSPOy+GGGp64uCrr1vX3BVloQGeIphzupOJ7aIvr +ZSAH/ibF9WkItQ5XGSgmCZyPL5KnI76jT7BQNi0m +-----END CERTIFICATE----- diff --git a/icinga2/pki/ns1.uhu-banane.de.crt b/icinga2/pki/ns1.uhu-banane.de.crt new file mode 100644 index 0000000..487f5f3 --- /dev/null +++ b/icinga2/pki/ns1.uhu-banane.de.crt @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE7DCCAtSgAwIBAgIUaiBgugaB2ydyr8R5jzLSmwPE6a0wDQYJKoZIhvcNAQEL +BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTE3MDkyMTIwNTEyMloXDTMyMDkx +NzIwNTEyMlowHDEaMBgGA1UEAwwRbnMxLnVodS1iYW5hbmUuZGUwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQDCYWGXNqfyEAXd9Nfdka3xotFaUWY/Qrj+ +arOfyLz1+vTd50dtQJd5Q4KEVOiTyWJ6oamOj146TtksnHGE2Wv8GPxpNS/9d2UQ +A8WAKG+Lol9NybfFGLVCGsApnMnwvMkP0/CjhxIL+bERyWhpPdGMw4MgYxm/Bifr +FgmVZTp7dD/rjBY7XrZvsMY7+cBhDLmqzNabYX/SbWoDmIn42fuu+ik05ir+JBZa +Mlryqll5Iou/p3jJuPzggqhIJWcO8nyaB1XKtHWaTZMcoQET0ETx8iwxlQR0uYQ9 +At0+t7T0Ez4DfbjF1UP4SSDkm8O0BNMGDi/OZwG3YGMG9SJ2zE3AV18OuqVbY/LY +R0T1MfDJYSIEaYUwiyvuCdKHi/dAdmvftpBIRvZ98Gn+2a+pP2ZiqfDuDZ8StC1Z +roXlOFcQYZ+Cg6o0r8nvGozSVvE7xAdXWY89eSiFGdcXrMBBwb/cYU7DzD/wHDOe +4XoyHCtbXIVF9Cy0YfPnOttsOKF1IUfjtLShAOzga2XgX2o5FXhaJDelGkr85tRb +OVDZBsZTtBUVx6I5H3M4zuQM9sB2OSwJlppBCsLezACPAtXlZBb8v3GXDqw7UnQG +kstokG9+YTHJA+EHgtvsvvVutdSCTjkl9LslfyUuPBsXn6tMldlRyYsj4cQeFKDV +PnY9Yo3dMQIDAQABoy4wLDAMBgNVHRMBAf8EAjAAMBwGA1UdEQQVMBOCEW5zMS51 +aHUtYmFuYW5lLmRlMA0GCSqGSIb3DQEBCwUAA4ICAQCQDXG9IOvNdMIQ4FZosh3V +VsJtNGVSAmdtlFZ80ZRFsb3QmPIz5pZ9m+YZNift+dxFnYOsV30taRFIPKSxwDRq +K1UsTsFg2uC/oFi7Vz6awSyguxo2gRWC1Lg78MU7EJlwdz8+yYK2IH9eh0WJPfMc +mL4vZvwe0ILB3hejWYkLq+tnHQuTfSW5puU6o0mOLJ6jzHsPDZ9i4uG97FEZZTmd +Vcv9HPqNgjCzFCP/XcS7srlte13QHd2HoT1uMLHs2EBZRtmRLROP67Swysl/au6y +uYEcwbs4O1WZfW+CS40raDG9nxF3TdhWyjChWcKdeiwPMpeWMDRhXYR2GoEKOdZn +8rnqcr7UZ3fzLg32UaK2JKzFRKw4/et3EIbIpuGQ+oEuP48wUACxIZHOiNeMBJ4D +IeUxXlXLu1HS34RFEKNffKkq6yfvd2v1yhWPp/mSyavw9zOeQ3rrjQHiM0w6Le3u +1olLiZRzn3T9Qi+ajTDTnF99idfy1DWPI3miNiZjI5keV01F/X4k468AUb1OIRDh +cPpcnS41PD+2BKMMJVv/8VKZFTa5e0DR0JhBowXMpn3p9dWW5uBe0H6XAXYrUjFg +AIf5Db+N1Z2KB4o5j+lv98hpb7rkRL1R+S0mRr3H1EeMD9BkFADnazJ5kWrDCaZY +IErLBWW43fiBiqmFKdp3Xg== +-----END CERTIFICATE----- diff --git a/icinga2/pki/ns1.uhu-banane.de.csr b/icinga2/pki/ns1.uhu-banane.de.csr new file mode 100644 index 0000000..2685aad --- /dev/null +++ b/icinga2/pki/ns1.uhu-banane.de.csr @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEkDCCAngCAQAwHDEaMBgGA1UEAwwRbnMxLnVodS1iYW5hbmUuZGUwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDCYWGXNqfyEAXd9Nfdka3xotFaUWY/ +Qrj+arOfyLz1+vTd50dtQJd5Q4KEVOiTyWJ6oamOj146TtksnHGE2Wv8GPxpNS/9 +d2UQA8WAKG+Lol9NybfFGLVCGsApnMnwvMkP0/CjhxIL+bERyWhpPdGMw4MgYxm/ +BifrFgmVZTp7dD/rjBY7XrZvsMY7+cBhDLmqzNabYX/SbWoDmIn42fuu+ik05ir+ +JBZaMlryqll5Iou/p3jJuPzggqhIJWcO8nyaB1XKtHWaTZMcoQET0ETx8iwxlQR0 +uYQ9At0+t7T0Ez4DfbjF1UP4SSDkm8O0BNMGDi/OZwG3YGMG9SJ2zE3AV18OuqVb +Y/LYR0T1MfDJYSIEaYUwiyvuCdKHi/dAdmvftpBIRvZ98Gn+2a+pP2ZiqfDuDZ8S +tC1ZroXlOFcQYZ+Cg6o0r8nvGozSVvE7xAdXWY89eSiFGdcXrMBBwb/cYU7DzD/w +HDOe4XoyHCtbXIVF9Cy0YfPnOttsOKF1IUfjtLShAOzga2XgX2o5FXhaJDelGkr8 +5tRbOVDZBsZTtBUVx6I5H3M4zuQM9sB2OSwJlppBCsLezACPAtXlZBb8v3GXDqw7 +UnQGkstokG9+YTHJA+EHgtvsvvVutdSCTjkl9LslfyUuPBsXn6tMldlRyYsj4cQe +FKDVPnY9Yo3dMQIDAQABoC8wLQYJKoZIhvcNAQkOMSAwHjAcBgNVHREEFTATghFu +czEudWh1LWJhbmFuZS5kZTANBgkqhkiG9w0BAQsFAAOCAgEArvUQXKfs2idnquTb ++H+35DE6j3kaC3Oei/8W4e9Wy7t+2He6Rg72Xra7EL/ECiewYZXVxt9fKdidyXGw +z+zGCjbcIArHlPPvGY9be4XLzJ1DhR5cLNZ5JrAIjwksCAW+XXNnjzRDJdLc0np4 +At4Cye9tQL/JuoFKR/6+OIDMMjFHEENXFaRmv/NM8cQboeP2B6FtuZEofq1+KipT +jWQfJMQiZR/N4JXqcblQm01dLB+GbyCqsGNs7mc9mqgwlsLZekgN2tdxHGlpLTsY +GZ57SNkuqMbKZsYgAprGer5D+aLaIgLpWrSRcbvrknhCW4LvLP8CJJ4slRF1BL4f +ybwL1TdtrucTsOPtYcItjtrU1deNKJgCz+81OCNfBeQrtvj4wpwojnv9EgEEczEh +51oAc93CsBDPfuOAbsHL/h3Qp4lFo2sBEwr6et/AympkNQy9PLofjdjeDwuTlmlS +Pf5N5xc2PSOz3Lg04ow1i8Ql5xpV4a8UaIIpiVMaef/SBuEhRns+CI+kuEsaAIes +jJA5FaE6eqN1Ci18IXuuo84f4m1kwOVpe48j9vytaQ+ofDWoeZoa7IqI/TvyGQRX +fBSeszlqCZxntUWczpWpKCWOoyJwM8bFBh2/ILgAl2XnK12dQG0KB4fayAxnv9R9 +gcq7+ZPzhbOqGzZxhLMbTNlvW+g= +-----END CERTIFICATE REQUEST----- diff --git a/icinga2/pki/ns1.uhu-banane.de.key b/icinga2/pki/ns1.uhu-banane.de.key new file mode 100644 index 0000000..6112cde --- /dev/null +++ b/icinga2/pki/ns1.uhu-banane.de.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vim/vimrc.local b/vim/vimrc.local index 9f909fd..bbc72e2 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -16,6 +16,7 @@ autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2 autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4 autocmd FileType sh set tabstop=4 expandtab shiftwidth=4 softtabstop=4 autocmd FileType perl set tabstop=4 noexpandtab shiftwidth=4 +autocmd FileType icinga2 set tabstop=2 expandtab shiftwidth=2 softtabstop=2 list set listchars=tab:»·,trail:· " set list -- 2.39.5