From 61adecb3ed2eb8ac0709045a8a737d0fa7bec700 Mon Sep 17 00:00:00 2001 From: thom <thom@amsterdamtech.nl> Date: Mon, 14 Sep 2020 23:31:56 +0200 Subject: [PATCH] Make LE log viewable in UI (#4594) --- interface/web/monitor/lib/lang/ar.lng | 2 + interface/web/monitor/lib/lang/bg.lng | 2 + interface/web/monitor/lib/lang/br.lng | 2 + interface/web/monitor/lib/lang/ca.lng | 2 + interface/web/monitor/lib/lang/cz.lng | 2 + interface/web/monitor/lib/lang/de.lng | 2 + interface/web/monitor/lib/lang/dk.lng | 2 + interface/web/monitor/lib/lang/el.lng | 2 + interface/web/monitor/lib/lang/en.lng | 2 + interface/web/monitor/lib/lang/es.lng | 2 + interface/web/monitor/lib/lang/fi.lng | 2 + interface/web/monitor/lib/lang/fr.lng | 2 + interface/web/monitor/lib/lang/hr.lng | 2 + interface/web/monitor/lib/lang/hu.lng | 2 + interface/web/monitor/lib/lang/id.lng | 2 + interface/web/monitor/lib/lang/it.lng | 2 + interface/web/monitor/lib/lang/ja.lng | 2 + interface/web/monitor/lib/lang/nl.lng | 2 + interface/web/monitor/lib/lang/pl.lng | 2 + interface/web/monitor/lib/lang/pt.lng | 2 + interface/web/monitor/lib/lang/ro.lng | 2 + interface/web/monitor/lib/lang/ru.lng | 2 + interface/web/monitor/lib/lang/se.lng | 2 + interface/web/monitor/lib/lang/sk.lng | 2 + interface/web/monitor/lib/lang/tr.lng | 2 + interface/web/monitor/lib/module.conf.php | 5 + interface/web/monitor/show_log.php | 7 +- interface/web/monitor/show_sys_state.php | 11 +- .../100-monitor_letsencrypt_log.inc.php | 105 ++++++++++++++++++ server/lib/classes/monitor_tools.inc.php | 21 +++- 30 files changed, 189 insertions(+), 10 deletions(-) create mode 100644 server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index 6a63ea9ab5..b0972152da 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Show Mail Error-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index ec28969581..59dd3eeb29 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -36,6 +36,7 @@ $wb['Show Mail warn-Log'] = 'Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Mail warn-Log'; $wb['Show Mail err-Log'] = 'Покажи Mail err-Log'; $wb['Show System-Log'] = 'Покажи System-Log'; $wb['Show Freshclam-Log'] = 'Покажи Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Покажи Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Покажи ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Покажи RKHunter-Log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - лог'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - лог'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 781dd1e7e1..b68fe541aa 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -43,6 +43,7 @@ $wb['Show Mail err-Log'] = 'Exibir log de erros de e-mail'; $wb['Show System-Log'] = 'Exibir log do sistema'; $wb['Show ISPC Cron-Log'] = 'Exibir log do cron'; $wb['Show Freshclam-Log'] = 'Exibir log do freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Exibir log do clamav'; $wb['Show ISPConfig-Log'] = 'Exibir log do ISPConfig'; $wb['Show RKHunter-Log'] = 'Exibir log do rkhunter'; @@ -70,6 +71,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log - Alertas de e-mail'; $wb['monitor_logs_mailerr_txt'] = 'Log - Erros de e-mail'; $wb['monitor_logs_messages_txt'] = 'Log - Mensagens do sistema'; $wb['monitor_logs_ispccron_txt'] = 'Log - Tarefas no cron'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Log - freshclam'; $wb['monitor_logs_clamav_txt'] = 'Log - clamav'; $wb['monitor_logs_ispc_txt'] = 'Log - ISPConfig'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index ebceac3467..273bf4196c 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Voir les logs mails d\'erreur'; $wb['Show System-Log'] = 'Voir les logs système'; $wb['Show ISPC Cron-Log'] = 'Voir les logs des crons ISPC'; $wb['Show Freshclam-Log'] = 'Voir les logs de Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Voir les logs de Clamav'; $wb['Show ISPConfig-Log'] = 'Voir les logs dISPConfig'; $wb['Show RKHunter-Log'] = 'Voir les logs de RKHunter'; @@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log'; $wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log'; $wb['monitor_logs_messages_txt'] = 'Messages Système - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 604fbd5ceb..db89fd310b 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Zobrazit e-mailový log chyb'; $wb['Show System-Log'] = 'Zobrazit systémový log'; $wb['Show ISPC Cron-Log'] = 'Zobrazit ISPConfig cron log'; $wb['Show Freshclam-Log'] = 'Zobrazit Freshclam log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Zobrazit Clamav log'; $wb['Show ISPConfig-Log'] = 'Zobrazit ISPConfig log'; $wb['Show RKHunter-Log'] = 'Zobrazit RKHunter log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-mail - Varovánà - Log'; $wb['monitor_logs_mailerr_txt'] = 'E-mail - Chyby - Log'; $wb['monitor_logs_messages_txt'] = 'Systénové zprávy - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 63cb5b9848..3c84e2b80e 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -36,6 +36,7 @@ $wb['Show Mail warn-Log'] = 'E-Mail Warn Protokoll anzeigen'; $wb['Show Mail err-Log'] = 'E-Mail Fehler Protokoll anzeigen'; $wb['Show System-Log'] = 'System Protokoll anzeigen'; $wb['Show Freshclam-Log'] = 'Freshclam Protokoll anzeigen'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'ClamAV Protokoll anzeigen'; $wb['Show ISPConfig-Log'] = 'ISPConfig Protokoll anzeigen'; $wb['Show RKHunter-Log'] = 'RKHunter Protokoll anzeigen'; @@ -60,6 +61,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-Mail Warnung Protokoll'; $wb['monitor_logs_mailerr_txt'] = 'E-Mail Fehler Protokoll'; $wb['monitor_logs_messages_txt'] = 'Systemmeldungen Protokoll'; $wb['monitor_logs_ispccron_txt'] = 'Cron Protokoll'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam Protokoll'; $wb['monitor_logs_clamav_txt'] = 'ClamAV Protokoll'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig Protokoll'; diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index 0a7f8bc19e..69f41955bd 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Vis Mail Fejl-Log'; $wb['Show System-Log'] = 'Vis System-Log'; $wb['Show ISPC Cron-Log'] = 'Vis ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Vis Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Vis Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Vis ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Vis RKHunter-Log'; @@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Advarsel - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Fejl - Log'; $wb['monitor_logs_messages_txt'] = 'System Meddelelser - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 1d783f3da7..4b079c6be8 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'ΑÏχείο σφαλμάτων mail'; $wb['Show System-Log'] = 'ΑÏχείο καταγÏαφής συστήματος'; $wb['Show ISPC Cron-Log'] = 'ΑÏχείο καταγÏαφής ISPC Cron'; $wb['Show Freshclam-Log'] = 'ΑÏχείο καταγÏαφής Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'ΑÏχείο καταγÏαφής Clamav'; $wb['Show ISPConfig-Log'] = 'ΑÏχείο καταγÏαφής ISPConfig'; $wb['Show RKHunter-Log'] = 'ΑÏχείο καταγÏαφής RKHunter'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'ΑÏχείο καταγÏαφής Mail-Warn $wb['monitor_logs_mailerr_txt'] = 'ΑÏχείο καταγÏαφής Mail-Error'; $wb['monitor_logs_messages_txt'] = 'ΑÏχείο καταγÏαφής μηνυμάτων συστήματος'; $wb['monitor_logs_ispccron_txt'] = 'ΑÏχείο καταγÏαφής ISPConfig Cron'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'ΑÏχείο καταγÏαφής Freshclam'; $wb['monitor_logs_clamav_txt'] = 'ΑÏχείο καταγÏαφής ClamAV'; $wb['monitor_logs_ispc_txt'] = 'ΑÏχείο καταγÏαφής ISPConfig'; diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index f507f54229..c8db5314ac 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -42,6 +42,7 @@ $wb['Show Mail err-Log'] = 'Show Mail Error-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; @@ -69,6 +70,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 56ce9a4222..01e29d091a 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -19,6 +19,7 @@ $wb['monitor_diskusage_used_txt'] = 'Usado'; $wb['monitor_general_serverstate_txt'] = 'Estado del Servidor'; $wb['monitor_general_systemstate_txt'] = 'Estado del Sistema'; $wb['monitor_logs_clamav_txt'] = 'Registros de ClamAV'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Registros de Freshclam '; $wb['monitor_logs_ispc_txt'] = 'Registros de ISPConfig'; $wb['monitor_logs_ispccron_txt'] = 'Registros de las tareas programadas de ISPConfig (Cron)'; @@ -130,6 +131,7 @@ $wb['Server Load'] = 'Carga del servidor'; $wb['Server online since'] = 'Servidor en lÃnea desde'; $wb['Server State'] = 'Estado del servidor'; $wb['Server to Monitor'] = 'Servidor a supervisar'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Mostrar el registro de ClamAV'; $wb['Show CPU info'] = 'Mostrar información de la CPU'; $wb['Show Disk usage'] = 'Mostrar el uso del disco'; diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index f825f6e20b..5d76672d30 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -40,6 +40,7 @@ $wb['Show Mail warn-Log'] = 'Näytä postipalvelimen varoitusloki'; $wb['Show Mail err-Log'] = 'Näytä postipalvelimen virheloki'; $wb['Show System-Log'] = 'Näytä järjestelmäloki'; $wb['Show Freshclam-Log'] = 'Näytä Freshclam-Loki'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Näytä Clamav-Loki'; $wb['Show ISPConfig-Log'] = 'Näytä ISPConfig-Loki'; $wb['Show ISPC Cron-Log'] = 'Näytä ISPC Cron-Loki'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Postipalvelimen varoitusloki'; $wb['monitor_logs_mailerr_txt'] = 'Postipalvelimen virheloki'; $wb['monitor_logs_messages_txt'] = 'Järjestelmän viestiloki'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig-ajastusloki'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam-päivitysloki'; $wb['monitor_logs_clamav_txt'] = 'Clamav-päivitysloki'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig-pääloki'; diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 8bf754cb9b..b6936d5f1b 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Voir les logs mails d’erreur'; $wb['Show System-Log'] = 'Voir les logs système'; $wb['Show ISPC Cron-Log'] = 'Voir les logs des crons ISPC'; $wb['Show Freshclam-Log'] = 'Voir les logs de Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Voir les logs de Clamav'; $wb['Show ISPConfig-Log'] = 'Voir les logs dISPConfig'; $wb['Show RKHunter-Log'] = 'Voir les logs de RKHunter'; @@ -62,6 +63,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log'; $wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log'; $wb['monitor_logs_messages_txt'] = 'Messages Système - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index 4c8037604a..8d7f169de6 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Prikaži mail log (greÅ¡ke)'; $wb['Show System-Log'] = 'Prikaži sistemski log'; $wb['Show ISPC Cron-Log'] = 'Prikaži control panel cron log'; $wb['Show Freshclam-Log'] = 'Prikaži freshclam log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Prikaži clamav log'; $wb['Show ISPConfig-Log'] = 'Prikaži control panel log'; $wb['Show RKHunter-Log'] = 'Prikaži RKHunter log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail log upozorenja'; $wb['monitor_logs_mailerr_txt'] = 'Mail log greÅ¡ke'; $wb['monitor_logs_messages_txt'] = 'Sistemski log-ovi'; $wb['monitor_logs_ispccron_txt'] = 'Control panel cron log-ovi'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam log-ovi'; $wb['monitor_logs_clamav_txt'] = 'ClamAV log-ovi'; $wb['monitor_logs_ispc_txt'] = 'Control panel log-ovi'; diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index e9ac7009f0..4b96a95f7b 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Show Mail err-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Napló'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Napló'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index 8a1bba91d8..131a93d67f 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Tampilkan Log Kesalahan Mail'; $wb['Show System-Log'] = 'Tampilkan Log Sistem'; $wb['Show ISPC Cron-Log'] = 'Tampilkan Log Cron ISPC'; $wb['Show Freshclam-Log'] = 'Tampilkan Log Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Tampilkan Log Clamav'; $wb['Show ISPConfig-Log'] = 'Tampilkan Log ISPConfig'; $wb['Show RKHunter-Log'] = 'Tampilkan Log RKHunter'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log - Mail-Warn'; $wb['monitor_logs_mailerr_txt'] = 'Log - Mail-Error'; $wb['monitor_logs_messages_txt'] = 'Log - Pesan Sistem'; $wb['monitor_logs_ispccron_txt'] = 'Log - Cron ISPConfig'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Log - Freshclam'; $wb['monitor_logs_clamav_txt'] = 'Log - ClamAV'; $wb['monitor_logs_ispc_txt'] = 'Log - ISPConfig'; diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index 675f27494b..dab5724244 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -35,6 +35,7 @@ $wb['Show Mail-Log'] = 'Mostra log mail'; $wb['Show Mail warn-Log'] = 'Mostra log avvisi mail'; $wb['Show Mail err-Log'] = 'Mostra log errori mail'; $wb['Show Freshclam-Log'] = 'Mostra log Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Mostra log Clamav'; $wb['Show ISPConfig-Log'] = 'Mostra log ISPConfig'; $wb['Show System-Log'] = 'Mostra log di sistema'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 3ea8fb1dfd..9509e0ff2b 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'メールエラーãƒã‚°ã‚’見る'; $wb['Show System-Log'] = 'システムãƒã‚°ã‚’見る'; $wb['Show ISPC Cron-Log'] = 'ISPConfigã®cronãƒã‚°ã‚’見る'; $wb['Show Freshclam-Log'] = 'Freshclam ã®ãƒã‚°ã‚’見る'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Clamav ã®ãƒã‚°ã‚’見る'; $wb['Show ISPConfig-Log'] = 'ISPConfigã®ãƒã‚°ã‚’見る'; $wb['Show RKHunter-Log'] = 'RKHunterã®ãƒã‚°ã‚’見る'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'メールè¦å‘Š - ãƒã‚°'; $wb['monitor_logs_mailerr_txt'] = 'メールエラー - ãƒã‚°'; $wb['monitor_logs_messages_txt'] = 'システムメッセージ - ãƒã‚°'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - ãƒã‚°'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - ãƒã‚°'; $wb['monitor_logs_clamav_txt'] = 'Clamav - ãƒã‚°'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - ãƒã‚°'; diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index bef9eb80a2..cd74c849ef 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -36,6 +36,7 @@ $wb['Show Mail warn-Log'] = 'E-Mail warn-log'; $wb['Show Mail err-Log'] = 'E-Mail mail-err-log'; $wb['Show System-Log'] = 'Systeem logboek'; $wb['Show Freshclam-Log'] = 'Freshclam-log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Clamav-Log'; $wb['Show ISPConfig-Log'] = 'ISPConfig-log'; $wb['Show RKHunter-Log'] = 'Rootkit Hunter-log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'Systemberichten - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 6900d31b92..8208edb745 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Pokaż Log bÅ‚Ä™dów Mail'; $wb['Show System-Log'] = 'Pokaż Log systemowy'; $wb['Show ISPC Cron-Log'] = 'Pokaż Log ISPC Crone'; $wb['Show Freshclam-Log'] = 'Pokaż Log Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Pokaż Log Clamav'; $wb['Show ISPConfig-Log'] = 'Pokaż Log ISPConfig'; $wb['Show RKHunter-Log'] = 'Pokaż Log RKHunter'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log ostrzeżeÅ„ Mail'; $wb['monitor_logs_mailerr_txt'] = 'Log bÅ‚Ä™dów Mail'; $wb['monitor_logs_messages_txt'] = 'Log wiadomoÅ›ci systemu'; $wb['monitor_logs_ispccron_txt'] = 'Log ISPConfig Cron'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Log Freshclam'; $wb['monitor_logs_clamav_txt'] = 'Log Clamav'; $wb['monitor_logs_ispc_txt'] = 'Log ISPConfig'; diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index f48c41e9fe..15e2478dfb 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Exibir Log de Erros de Correio'; $wb['Show System-Log'] = 'Exibir Log de Sistema'; $wb['Show ISPC Cron-Log'] = 'Exibir ISPC Log do Cron'; $wb['Show Freshclam-Log'] = 'Exibir Log do Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Exibir Log do Clamav'; $wb['Show ISPConfig-Log'] = 'Exibir Log do ISPConfig'; $wb['Show RKHunter-Log'] = 'Exibir Log do RKHunter'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Log de Avisos'; $wb['monitor_logs_mailerr_txt'] = 'Log de Erros'; $wb['monitor_logs_messages_txt'] = 'Log de Sistema'; $wb['monitor_logs_ispccron_txt'] = 'Log do ISPConfig Cron'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Logo do Freshclam'; $wb['monitor_logs_clamav_txt'] = 'Log do Clamav '; $wb['monitor_logs_ispc_txt'] = 'Log do ISPConfig'; diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 2a2423927f..1686bb13e8 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Show Mail Error-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index c256c2faaf..471ab64967 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -36,6 +36,7 @@ $wb['Show Mail warn-Log'] = 'Показать журнал предупрежд $wb['Show Mail err-Log'] = 'Показать журнал ошибок почты'; $wb['Show System-Log'] = 'Показать ÑиÑтемный журнал'; $wb['Show Freshclam-Log'] = 'Показать журнал Freshclam'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Показать журнал Clamav'; $wb['Show ISPConfig-Log'] = 'Показать журнал ISPConfig'; $wb['Show RKHunter-Log'] = 'Показать журнал RKHunter'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ - ж $wb['monitor_logs_mailerr_txt'] = 'Ошибки почты - журнал'; $wb['monitor_logs_messages_txt'] = 'СиÑтемные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ - журнал'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig планировщик - журнал'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - журнал'; $wb['monitor_logs_clamav_txt'] = 'Clamav - журнал'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - журнал'; diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 54b504c9bb..5dd1d7f8f1 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -36,6 +36,7 @@ $wb['Show Mail warn-Log'] = 'Visa varningslogg epost'; $wb['Show Mail err-Log'] = 'Visa felloggg epost'; $wb['Show System-Log'] = 'Visa systemlogg'; $wb['Show Freshclam-Log'] = 'Visa Freshclam-logg'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Visa Clamav-logg'; $wb['Show ISPConfig-Log'] = 'Visa ISPConfig-logg'; $wb['Show RKHunter-Log'] = 'Visa RKHunter-logg'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Varningslogg epost'; $wb['monitor_logs_mailerr_txt'] = 'Fellogg epost'; $wb['monitor_logs_messages_txt'] = 'Systemmeddelandelogg'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - logg'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam -logg'; $wb['monitor_logs_clamav_txt'] = 'Clamav - logg'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - logg'; diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 59af606856..e69ed2c155 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -41,6 +41,7 @@ $wb['Show Mail err-Log'] = 'Show Mail err-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; @@ -59,6 +60,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 836f38ce97..c18e56447f 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -42,6 +42,7 @@ $wb['Show Mail err-Log'] = 'E-posta Hata Günlüğü'; $wb['Show System-Log'] = 'Sistem Günlüğü'; $wb['Show ISPC Cron-Log'] = 'Zamanlı Görev Günlüğü'; $wb['Show Freshclam-Log'] = 'Freshclam Günlüğü'; +$wb['Show Let\'s Encrypt log'] = 'Show Let\'s Encrypt log'; $wb['Show Clamav-Log'] = 'Clamav Günlüğü'; $wb['Show ISPConfig-Log'] = 'ISPConfig Günlüğü'; $wb['Show RKHunter-Log'] = 'RKHunter Günlüğü'; @@ -68,6 +69,7 @@ $wb['monitor_logs_mailwarn_txt'] = 'E-posta Uyarı Günlüğü'; $wb['monitor_logs_mailerr_txt'] = 'E-posta Hata Günlüğü'; $wb['monitor_logs_messages_txt'] = 'Sistem Ä°letileri Günlüğü'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Zamanlı Görev Günlüğü'; +$wb['monitor_logs_letsencrypt_txt'] = 'Let\'s Encrypt - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam GÃœnlüğü'; $wb['monitor_logs_clamav_txt'] = 'Clamav Günlüğü'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig Günlüğü'; diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php index ddb4972aae..3e45392df5 100644 --- a/interface/web/monitor/lib/module.conf.php +++ b/interface/web/monitor/lib/module.conf.php @@ -181,6 +181,11 @@ $items[] = array( 'title' => "Show ISPC Cron-Log", 'link' => 'monitor/show_log.php?log=log_ispc_cron', 'html_id' => 'log_ispc_cron'); +$items[] = array( 'title' => "Show Let's Encrypt log", + 'target' => 'content', + 'link' => 'monitor/show_log.php?log=log_letsencrypt', + 'html_id' => 'log_letsencrypt'); + $items[] = array( 'title' => "Show Freshclam-Log", 'target' => 'content', 'link' => 'monitor/show_log.php?log=log_freshclam', diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php index 4889e83dd9..b352b9d021 100644 --- a/interface/web/monitor/show_log.php +++ b/interface/web/monitor/show_log.php @@ -79,6 +79,11 @@ case 'log_ispc_cron': $title = $app->lng("monitor_logs_ispccron_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')'; $description = ''; break; +case 'log_letsencrypt': + $logId = 'log_letsencrypt'; + $title = $app->lng("monitor_logs_letsencrypt_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')'; + $description = ''; + break; case 'log_freshclam': $logId = 'log_freshclam'; $title = $app->lng("monitor_logs_freshclam_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')'; @@ -127,7 +132,7 @@ if(isset($record['data'])) { $logData = explode("\n", htmlspecialchars($data)); $logDataHtml = ''; - + /* set css class for each line of log, depending on key words in each line */ foreach($logData as $line => $val) { if (strpos($val, 'ERROR') !== FALSE) { diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index 904519f892..9e70496a81 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -223,12 +223,12 @@ function _getServerState($serverId, $serverName) { /* * Info of a VE inside a OpenVz-Host */ - + $alert_class = 'alert-info'; if($serverState == 'ok') $alert_class = 'alert-success'; if($serverState == 'warning') $alert_class = 'alert-warning'; if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger'; - + //$html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">'; //$html_ve = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">'; $html_server = '<div class="alert '.$alert_class.'" role="alert">'; @@ -254,7 +254,7 @@ function _getServerState($serverId, $serverName) { * Info of a "normal" Server or a OpenVz-Host */ //$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">'; - + /* switch ($oldState) { case 'no_state': $oldInt = 0; @@ -276,7 +276,7 @@ function _getServerState($serverId, $serverName) { if($serverState == 'ok') $alert_class = 'alert-success'; if($serverState == 'warning') $alert_class = 'alert-warning'; if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger'; - + $html_server = '<div class="alert '.$alert_class.'" role="alert">'; if ($osData != null) { //$html_server .= '<div class="icoDevice"><p class="status"></p></div>'; @@ -615,6 +615,9 @@ function _processDbState($type, $serverId, $serverState, $messages) { if ($type == 'log_messages') { /* this type has no state */ } + if ($type == 'log_letsencrypt') { + /* this type has no state */ + } if ($type == 'rkhunter') { /* this type has no state */ } diff --git a/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php b/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php new file mode 100644 index 0000000000..401dcd1e55 --- /dev/null +++ b/server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php @@ -0,0 +1,105 @@ +<?php + +/* +Copyright (c) 2013, Marius Cramer, pixcept KG +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of ISPConfig nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +class cronjob_monitor_letsencrypt_log extends cronjob { + + // job schedule + protected $_schedule = '*/5 * * * *'; + protected $_run_at_new = true; + + private $_tools = null; + + /* this function is optional if it contains no custom code */ + public function onPrepare() { + global $app; + + parent::onPrepare(); + } + + /* this function is optional if it contains no custom code */ + public function onBeforeRun() { + global $app; + + return parent::onBeforeRun(); + } + + public function onRunJob() { + global $app, $conf; + + /* used for all monitor cronjobs */ + $app->load('monitor_tools'); + $this->_tools = new monitor_tools(); + /* end global section for monitor cronjobs */ + + /* the id of the server as int */ + $server_id = intval($conf['server_id']); + + /** The type of the data */ + $type = 'log_letsencrypt'; + + /* Get the data of the log */ + $data = $this->_tools->_getLogData($type); + + /* + * actually this info has no state. + * maybe someone knows better...???... + */ + $state = 'no_state'; + + /* + * Return the Result + */ + $res = array(); + $res['server_id'] = $server_id; + $res['type'] = $type; + $res['data'] = $data; + $res['state'] = $state; + + /* + * Insert the data into the database + */ + $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' . + 'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)'; + $app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']); + + /* The new data is written, now we can delete the old one */ + $this->_tools->delOldRecords($res['type'], $res['server_id']); + + parent::onRunJob(); + } + + /* this function is optional if it contains no custom code */ + public function onAfterRun() { + global $app; + + parent::onAfterRun(); + } +} +?> diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index e349acd128..247fc78bad 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -44,12 +44,12 @@ class monitor_tools { //** Debian or Ubuntu if(file_exists('/etc/debian_version')) { - + // Check if this is Ubuntu and not Debian if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu') || (is_file('/etc/os-release') && stristr(file_get_contents('/etc/os-release'), 'Ubuntu'))) { - + $issue = file_get_contents('/etc/issue'); - + // Use content of /etc/issue file if(strstr($issue,'Ubuntu')) { if (strstr(trim($issue), 'LTS')) { @@ -75,7 +75,7 @@ class monitor_tools { } else { $lts = ""; } - + $distname = 'Ubuntu'; $distid = 'debian40'; $distbaseid = 'debian'; @@ -353,7 +353,7 @@ class monitor_tools { } else { die('Unrecognized GNU/Linux distribution'); } - + // Set $distconfid to distid, if no different id for the config is defined if(!isset($distconfid)) $distconfid = $distid; @@ -560,6 +560,17 @@ class monitor_tools { $logfile = '/var/log/cron'; } break; + case 'log_letsencrypt': + if ($dist == 'debian') { + $logfile = '/var/log/letsencrypt/letsencrypt.log'; + } elseif ($dist == 'redhat') { + $logfile = '/var/log/letsencrypt/letsencrypt.log'; + } elseif ($dist == 'suse') { + $logfile = '/var/log/letsencrypt/letsencrypt.log'; + } elseif ($dist == 'gentoo') { + $logfile = '/var/log/letsencrypt/letsencrypt.log'; + } + break; case 'log_freshclam': if ($dist == 'debian') { $logfile = '/var/log/clamav/freshclam.log'; -- GitLab