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

Fix to always prioritize Journald

Browse Source
This commit is contained in:
Ilia Ross
2025-01-21 00:17:25 +02:00
parent 72fef64c4d
commit 5d31698099
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bandwidth/bandwidth-lib.pl
View File

@@ -8,7 +8,11 @@
BEGIN { push(@INC, ".."); };
use WebminCore;
&init_config();
if (&foreign_installed("syslog-ng", 1) == 2) {
if (&has_command('journalctl')) {
$syslog_module = undef;
$syslog_journald = "journald" ;
}
elsif (&foreign_installed("syslog-ng", 1) == 2) {
&foreign_require("syslog-ng");
$syslog_module = "syslog-ng";
}
@@ -16,10 +20,6 @@ elsif (&foreign_installed("syslog")) {
&foreign_require("syslog");
$syslog_module = "syslog";
}
else {
$syslog_module = undef;
$syslog_journald = "journald" if (&has_command('journalctl'));
}
&foreign_require("cron", "cron-lib.pl");
&foreign_require("net", "net-lib.pl");

10
bandwidth/index.cgi
View File

@@ -70,7 +70,11 @@ else {
# Make sure the needed firewall rules and syslog entry are in place
$missingrule = !&check_rules();
if ($syslog_module eq "syslog") {
if ($syslog_journald) {
# Systemd journal
$sysconf = 1; # nothing to do
}
elsif ($syslog_module eq "syslog") {
# Normal syslog
$conf = &syslog::get_config();
$sysconf = &find_sysconf($conf);
@@ -81,10 +85,6 @@ elsif ($syslog_module eq "syslog-ng") {
($ngdest, $ngfilter, $nglog) = &find_sysconf_ng($conf);
$sysconf = $ngdest && $ngfilter && $nglog;
}
elsif ($syslog_journald) {
# Systemd journal
$sysconf = 1; # nothing to do
}
if (($missingrule || !$sysconf) && $access{'setup'}) {
# Something is missing .. offer to set up

10
bandwidth/setup.cgi
View File

@@ -13,7 +13,11 @@ $iface =~ /^\S+$/ || &error($text{'setup_eiface'});
$err = &setup_rules($iface);
&error($err) if ($err);
if ($syslog_module eq "syslog") {
if ($syslog_journald) {
# Systemd journal
# No setup needed
}
elsif ($syslog_module eq "syslog") {
# Add syslog entry
$conf = &syslog::get_config();
$sysconf = &find_sysconf($conf);
@@ -93,10 +97,6 @@ elsif ($syslog_module eq "syslog-ng") {
}
&unlock_file($syslog_ng::config{'syslogng_conf'});
}
elsif ($syslog_journald) {
# Systemd journal
# No setup needed
}
# Save the interface
&lock_file($module_config_file);

10
bandwidth/turnoff.cgi
View File

@@ -9,7 +9,11 @@ $access{'setup'} || &error($text{'turnoff_ecannot'});
$err = &delete_rules();
&error($err) if ($err);
if ($syslog_module eq "syslog") {
if ($syslog_journald) {
# Systemd journal
# Nothing to do
}
elsif ($syslog_module eq "syslog") {
# Remove syslog entry
$conf = &syslog::get_config();
$sysconf = &find_sysconf($conf);
@@ -37,10 +41,6 @@ elsif ($syslog_module eq "syslog-ng") {
}
&unlock_file($syslog_ng::config{'syslogng_conf'});
}
elsif ($syslog_journald) {
# Systemd journal
# Nothing to do
}
# Remove rotation cron job
$job = &find_cron_job();