michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warn syslog and syslog-ng user that systemd-journald is found

Browse Source
This commit is contained in:
Ilia
2022-05-30 01:07:32 +03:00
parent c9b1db30e2
commit 3a7dda67cd
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
syslog-ng/index.cgi
View File

@@ -5,9 +5,16 @@ require './syslog-ng-lib.pl';
# Make sure it is installed
$ver = &get_syslog_ng_version();
# Suggest using a new module
my $index_econf2;
if (&has_command('systemctl')) {
if (&foreign_available('logviewer')) {
$index_econf2 = &text('index_econf2', "System Logs Viewer", "@{[&get_webprefix()]}/logviewer") . "<p><br>";
}
}
if (!$ver) {
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
&ui_print_endpage(&text('index_eprog', "<tt>$config{'syslogng_cmd'}</tt>", "../config.cgi?$module_name"));
&ui_print_endpage($index_econf2 . &text('index_eprog', "<tt>$config{'syslogng_cmd'}</tt>", "../config.cgi?$module_name"));
}
if (!-r $config{'syslogng_conf'} && -r $config{'alt_syslogng_conf'}) {
# Copy original template config file
@@ -16,7 +23,7 @@ if (!-r $config{'syslogng_conf'} && -r $config{'alt_syslogng_conf'}) {
}
if (!-r $config{'syslogng_conf'}) {
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
&ui_print_endpage(&text('index_econf', "<tt>$config{'syslogng_conf'}</tt>", "../config.cgi?$module_name"));
&ui_print_endpage($index_econf2 . &text('index_econf', "<tt>$config{'syslogng_conf'}</tt>", "../config.cgi?$module_name"));
}
&ui_print_header(undef, $text{'index_title'}, "", "intro", 1, 1, 0,

1
syslog-ng/lang/en
View File

@@ -1,6 +1,7 @@
index_title=System Logs NG
index_eprog=The system logging daemon $1 was not found on your system, or is not the syslog-ng program. Adjust the <a href='$2'>module configuration</a> to use the correct path.
index_econf=The Syslog-NG configuration file $1 was not found on your system. Adjust the <a href='$2'>module configuration</a> to use the correct path.
index_econf2=The <tt>systemd-journald</tt> service was detected on your system for collecting and storing logging data. It is recommended to use a new <a href='$2'>$1</a> module instead.
index_apply=Apply Configuration
index_applydesc=Click this button to activate the current Syslog-NG configuration.
index_stop=Stop Syslog-NG

9
syslog/index.cgi
View File

@@ -22,8 +22,15 @@ if ($config{'m4_conf'}) {
}
if (!-r $config{'syslog_conf'}) {
# Suggest using a new module
my $index_econf2;
if (&has_command('systemctl')) {
if (&foreign_available('logviewer')) {
$index_econf2 = &text('index_econf2', "System Logs Viewer", "@{[&get_webprefix()]}/logviewer") . "<p><br>";
}
}
# Not installed (maybe using syslog-ng)
&ui_print_endpage(&text('index_econf', "<tt>$config{'syslog_conf'}</tt>", "../config.cgi?$module_name"));
&ui_print_endpage($index_econf2 . &text('index_econf', "<tt>$config{'syslog_conf'}</tt>", "../config.cgi?$module_name"));
}
# Display syslog rules

1
syslog/lang/en
View File

@@ -2,6 +2,7 @@ index_title=System Logs
index_m4msg=Your system log configuration file $1 appears to contain <tt>m4</tt> directives. Before it can be edited, Webmin needs to pass the file through <tt>m4</tt> to safely remove these directives.
index_m4=Remove m4 directives from config file
index_econf=The syslog configuration file $1 was not found on your system. Maybe syslog is not installed, or a newer version like syslog-ng is in use, or the <a href='$2'>module configuration</a> is incorrect.
index_econf2=The <tt>systemd-journald</tt> service was detected on your system for collecting and storing logging data. It is recommended to use a new <a href='$2'>$1</a> module instead.
index_active=Active?
index_tag=Program
index_to=Log destination