mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 14:13:29 +00:00
Fix to correctly merge custom *.conf files
https://forum.virtualmin.com/t/fail2ban-intrusion-detector-firewalld-default-jail-options/133201/4?u=ilia
This commit is contained in:
@@ -83,16 +83,16 @@ if (-r $jfile) {
|
||||
push(@rv, &parse_config_file($jfile));
|
||||
}
|
||||
|
||||
my @lrv;
|
||||
# Read separate config files under jail.d
|
||||
my $jdir = "$config{'config_dir'}/jail.d";
|
||||
if (-d $jdir) {
|
||||
foreach my $f (glob("$jdir/*.conf")) {
|
||||
push(@rv, &parse_config_file($f));
|
||||
push(@lrv, &parse_config_file($f));
|
||||
}
|
||||
}
|
||||
|
||||
# Read the main local file, and separate files under jail.d
|
||||
my @lrv;
|
||||
my $jlfile = &make_local_file($jfile);
|
||||
if (-r $jlfile) {
|
||||
push(@lrv, &parse_config_file($jlfile));
|
||||
|
||||
Reference in New Issue
Block a user