Systemd units with @ in the name are legit, like virtualmin's clamd@scan

This commit is contained in:
Jamie Cameron
2014-09-13 16:06:21 -07:00
parent 7654c96a71
commit f73389554d
2 changed files with 25 additions and 1 deletions

24
apache/mpm_prefork.pl Executable file
View File

@@ -0,0 +1,24 @@
# mpm_prefork.pl
# Defines editors for the pre-forking module in apache 2.4.
# The actual functions for all of these are still in core.pl
sub mpm_prefork_directives
{
local $rv;
$rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareServers', 0, 0, 'global', 2.0 ],
[ 'MaxSpareServers', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];
return &make_directives($rv, $_[0], "mpm_prefork");
}

View File

@@ -1946,7 +1946,7 @@ foreach my $l (split(/\r?\n/, $out)) {
# Also find unit files for units that may be disabled at boot and not running,
# and so don't show up in systemctl list-units
opendir(UNITS, &get_systemd_root());
push(@units, grep { !/\.wants$/ && !/^\./ && !/\@/ } readdir(UNITS));
push(@units, grep { !/\.wants$/ && !/^\./ } readdir(UNITS));
closedir(UNITS);
# Skip useless units