From: mhoellein Date: Fri, 10 Jul 2020 22:21:08 +0000 (+0200) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=decc58038ecbddef6a8ea7598f81269e563be744;p=homeserver daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 4cd716bc..b1f57095 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2856,12 +2856,40 @@ 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/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 chmod 0755 'icingaweb2/modules/translation' 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 0644 'idmapd.conf' maybe chmod 0755 'ifplugd' maybe chmod 0755 'ifplugd/action.d' @@ -5448,6 +5476,7 @@ maybe chmod 0644 'letsencrypt/csr/1969_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/1970_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/1971_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/1972_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/1973_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' @@ -7422,6 +7451,7 @@ maybe chmod 0600 'letsencrypt/keys/1969_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/1970_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/1971_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/1972_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/1973_key-certbot.pem' maybe chmod 0755 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online' maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README' diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf index fdfd3d7f..6f77c38b 100644 --- a/icinga2/conf.d/api-users.conf +++ b/icinga2/conf.d/api-users.conf @@ -7,3 +7,10 @@ object ApiUser "root" { permissions = [ "*" ] } + +object ApiUser "home.hoellein.online" { + password = "tc110H9WD1hUaLRxM/9kJFXYuWoLrSaqhOTB6DFDuEB" + // client_cn = "" + + permissions = [ "*" ] +} diff --git a/icinga2/conf.d/hosts.conf b/icinga2/conf.d/hosts.conf index 0118f033..f9891604 100644 --- a/icinga2/conf.d/hosts.conf +++ b/icinga2/conf.d/hosts.conf @@ -37,10 +37,13 @@ object Host NodeName { /* Define disks and attributes for service apply rules in `services.conf`. */ vars.disks["disk"] = { + disk_wfree = "10%" /* No parameters. */ } vars.disks["disk /"] = { disk_partitions = "/" + disk_wfree = "10%" + disk_cfree = "5%" } /* Define notification mail attributes for notification apply rules in `notifications.conf`. */ diff --git a/icingaweb2/authentication.ini b/icingaweb2/authentication.ini new file mode 100644 index 00000000..6852ece5 --- /dev/null +++ b/icingaweb2/authentication.ini @@ -0,0 +1,3 @@ +[icingaweb2] +backend = "db" +resource = "icingaweb_db" diff --git a/icingaweb2/config.ini b/icingaweb2/config.ini new file mode 100644 index 00000000..890a4759 --- /dev/null +++ b/icingaweb2/config.ini @@ -0,0 +1,11 @@ +[global] +show_stacktraces = "1" +show_application_state_messages = "1" +config_backend = "db" +config_resource = "icingaweb_db" + +[logging] +log = "syslog" +level = "ERROR" +application = "icingaweb2" +facility = "user" diff --git a/icingaweb2/enabledModules/monitoring b/icingaweb2/enabledModules/monitoring new file mode 120000 index 00000000..c201d002 --- /dev/null +++ b/icingaweb2/enabledModules/monitoring @@ -0,0 +1 @@ +/usr/share/icingaweb2/modules/monitoring \ No newline at end of file diff --git a/icingaweb2/groups.ini b/icingaweb2/groups.ini new file mode 100644 index 00000000..6852ece5 --- /dev/null +++ b/icingaweb2/groups.ini @@ -0,0 +1,3 @@ +[icingaweb2] +backend = "db" +resource = "icingaweb_db" diff --git a/icingaweb2/modules/monitoring/backends.ini b/icingaweb2/modules/monitoring/backends.ini new file mode 100644 index 00000000..702a1a41 --- /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 00000000..f855ccfb --- /dev/null +++ b/icingaweb2/modules/monitoring/commandtransports.ini @@ -0,0 +1,6 @@ +[icinga2] +transport = "api" +host = "home.hoellein.online" +port = "5665" +username = "root" +password = "1c792f53515736aa" diff --git a/icingaweb2/modules/monitoring/config.ini b/icingaweb2/modules/monitoring/config.ini new file mode 100644 index 00000000..9b69fe86 --- /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 00000000..e85ca933 --- /dev/null +++ b/icingaweb2/resources.ini @@ -0,0 +1,21 @@ +[icingaweb_db] +type = "db" +db = "mysql" +host = "localhost" +port = "" +dbname = "icingaweb2" +username = "icinga2" +password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q" +charset = "utf8" +use_ssl = "0" + +[icinga_ido] +type = "db" +db = "mysql" +host = "localhost" +port = "" +dbname = "icinga2" +username = "icinga2" +password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q" +charset = "utf8" +use_ssl = "0" diff --git a/icingaweb2/roles.ini b/icingaweb2/roles.ini new file mode 100644 index 00000000..5e1c6ab0 --- /dev/null +++ b/icingaweb2/roles.ini @@ -0,0 +1,4 @@ +[Administratoren] +users = "admin" +permissions = "*" +groups = "Administratoren" diff --git a/icingaweb2/setup.token b/icingaweb2/setup.token deleted file mode 100644 index e402f4cb..00000000 --- a/icingaweb2/setup.token +++ /dev/null @@ -1 +0,0 @@ -8108ab536169883a \ No newline at end of file diff --git a/letsencrypt/csr/1973_csr-certbot.pem b/letsencrypt/csr/1973_csr-certbot.pem new file mode 100644 index 00000000..f70de8e3 --- /dev/null +++ b/letsencrypt/csr/1973_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOOk +TwcvXR+1mtKcyM9IGkqtQJxWqJa33ran4dUvOJMNZcFqyc1eB7M6R9/idbj+GYKL +4oG9tEaoodJXHFDkT6SBnXPg9vfzolQEWG8oRgaqCo+VyNil8kq0UYkzKn9ffZeE +2x4w9AL6EFS7OaN32ekV60aqLDwPM+u1gwupKxyvGS87eUYrt3A3nteedbgDXV5M +L6LYdEOnN6PMUechwRE2NWlNcRm5YUvCeFMiWpBnxudOJ2O2LKAAkLrQVi8CwcKk +vBGvAa6iCTtOzvjC+0X2vKuxWvvw7/5Gu0lhKjPJGocz+XAzb6HOGI59PupGQ39V +nWSECBDy0eKSllFuX90CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQBmHmpUb+Hx +NhP27pWAaUR7Z1z0Qvx9HcJ3Zle/ZK0xpvONebMRYC4D2e+VJgg+6caMyFTxFlk4 +wbdh+AIn4E5U20MsMxNm31TuhU85LO9Veb7o9P0GYMNioVS8T2cnpL07PPA5pQQx +N+k0SSSS2DHfRQfMa4YMal4oND23BgMCdQ4iAIGzbJIRn+ZnruyXj0H4eLIFMMS9 +cCGvT8soVyZSkwgG3dLbDVR3mmEHfwH/g7NSC+YX3R5jlxQ9fXKoEf2TOKclCRQZ +fWNBo3Ynq4JIPDd+BgRGR2HGp8OWNuNYwSMfDFnLgvB7pgkjBlEmjRmdXWCLP0GK +qhtYMIC9AVKu +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/1973_key-certbot.pem b/letsencrypt/keys/1973_key-certbot.pem new file mode 100644 index 00000000..5b4921cf --- /dev/null +++ b/letsencrypt/keys/1973_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDjpE8HL10ftZrS +nMjPSBpKrUCcVqiWt962p+HVLziTDWXBasnNXgezOkff4nW4/hmCi+KBvbRGqKHS +VxxQ5E+kgZ1z4Pb386JUBFhvKEYGqgqPlcjYpfJKtFGJMyp/X32XhNseMPQC+hBU +uzmjd9npFetGqiw8DzPrtYMLqSscrxkvO3lGK7dwN57XnnW4A11eTC+i2HRDpzej +zFHnIcERNjVpTXEZuWFLwnhTIlqQZ8bnTidjtiygAJC60FYvAsHCpLwRrwGuogk7 +Ts74wvtF9ryrsVr78O/+RrtJYSozyRqHM/lwM2+hzhiOfT7qRkN/VZ1khAgQ8tHi +kpZRbl/dAgMBAAECggEAahgZ/O9GJ5EsJxyLOpAQMN2uTy7UQ+pOEjMMPZ9UbrS/ +x/VNODmqvQ1ckiupUh6bJQys9GrFqmjNgoq217yQocsG5wriD42tChs8XBIZEOIP +KfxVLyOoWMjRd3AxTkvi7MsulFOcZgbFtbfMlTM2jDt6++Qz2Yn8WM6v1K9zOFpB +/VU6gK03UcKq9HkqGIUpqSY8Ub8zgt1/7B2xdKNsdpjkOM493wW/o6Z8PAPP8JZu +yuOayxDiTlt6wybAzWr7Bp6/p4S/lHJtHanduw6R6Ja+B4nCLTz8i3ZlQTDMu9+3 +pQVeutNDRbKm3gtMuQkwwP+L+f9HiNuRO2gLGiBowQKBgQD3KXFfB/yDx0CGOamD +7IUB7tzalVe4oVhChKe0/gQWTNdnEyFtIFsHr3n6dt2mz0353144W/vcwywWxfhD ++Sl5D78+i2bkP3OYqVPhxBKdtb5NtmxFpao8aQ5x14MOsKCvjBSGRkM1XcqD0Mq0 +CfYJVtvaVlXUXPljMyX8qIjfuwKBgQDryC0jT/SISWayPNUspsGGGABiZWCBJfzd +K8TAKOhJDp4lOGF3Uw1dJwbquuBtlQ/h8JVeE9VJ1ZtoIeO0cDfjkqFQafMI+UoN +Mz70Z/JecSujZ/7d5PeiNoT8rNJS7Jdsrz8Q//KoSbsPkn+gss2qDC17xHbfSO9s +nYLOekRJRwKBgA6NtypEWx8bVXZR4ORuweo6OXD5iD/L6FmKXCGxL2ZsweZE3xwA +4rtSHtmbtDOFU28aMv8Yk30NVQRGRfcircl+HuG87aMVBWaA2fqaRApbUEhdLITx +W1PRT9NuQD5WMjAEDJVXf8+dpTYbzkPJrl4gajOyD73Ad8LamSsGdYDPAoGAcpf7 +uCnoA0UJcJ84TFdPv0hzB1+WI66+0w+utGYtXzSHkDdyx3fKCvgo2HSzFw9XhMxV +DEA/bX8v5NBzxwKzZxug42BbCoV+hCPf+RF8LoJ6XxTwPhBGesRcpiGopzzt65jQ +4gZDfZ84Fz1wYj4EzxzUDk9SJvtfwj5bkNbD0YkCgYEAlGj6XUaOSXI0uyUOVBKZ +PIzja8W/xw1aDegAfQXorKDMqj6AKSSKfFWnI6In8oIMSmPzpOBgruueDiHV7RsT +ilNjFsBSzuXXxdF4ygQo29kIG1urMU5Oe0+i3HBnaA06pxBRpgeZQUwjf0BYBdbj +gkoKDCX2WA8EU2ayfH91jgA= +-----END PRIVATE KEY-----