version 1.49, 2020/01/06 15:36:49
|
version 1.51, 2020/02/16 21:57:59
|
Line 219 else {
|
Line 219 else {
|
|| '<DIST />' eq 'sles9') { |
|| '<DIST />' eq 'sles9') { |
$ssldir = '/etc/apache/vhosts.d'; |
$ssldir = '/etc/apache/vhosts.d'; |
} elsif ('<DIST />' =~ /^(suse|sles)/) { |
} elsif ('<DIST />' =~ /^(suse|sles)/) { |
$ssldir = '/etc/apache2/vhosts.d'; |
$ssldir = '/etc/apache2/vhosts.d'; |
} elsif ('<DIST />' =~ /^(debian|ubuntu)/) { |
} elsif ('<DIST />' =~ /^(debian|ubuntu)/) { |
$ssldir = '/etc/apache2/sites-available'; |
$ssldir = '/etc/apache2/sites-available'; |
} else { |
} else { |
Line 227 else {
|
Line 227 else {
|
} |
} |
my $hostname = Sys::Hostname::FQDN::fqdn(); |
my $hostname = Sys::Hostname::FQDN::fqdn(); |
my $hostip = Socket::inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost'); |
my $hostip = Socket::inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost'); |
my @expected = ('RewriteCond %{REQUEST_URI} ^/adm/wrapper/ext/(?!https:\/\/)', |
my @expected = ('RewriteCond %{REQUEST_URI} ^/adm/wrapper/ext/(?!https:)', |
'RewriteCond %{QUERY_STRING} (^|&(|amp;))usehttp=1($|&)', |
'RewriteCond %{QUERY_STRING} (^|&(|amp;))usehttp=1($|&)', |
'RewriteRule ^/adm/wrapper/ext/(?!https:\/\/) http://%{HTTP_HOST}%{REQUEST_URI} [R,L,NE]', |
'RewriteRule ^/adm/wrapper/ext/(?!https:\/\/) http://%{HTTP_HOST}%{REQUEST_URI} [R,L,NE]', |
'RewriteCond %{REMOTE_ADDR} 127.0.0.1', |
'RewriteCond %{REMOTE_ADDR} 127.0.0.1', |
Line 267 else {
|
Line 267 else {
|
} else { |
} else { |
chomp(); |
chomp(); |
s/^(\s+|\s+)$//g; |
s/^(\s+|\s+)$//g; |
push(@{$rewrites[$num]},$_); |
push(@{$rewrites[$num]},$_); |
} |
} |
} elsif (/^\s*<IfModule\s+mod_rewrite.c>/) { |
} elsif (/^\s*<IfModule\s+mod_rewrite.c>/) { |
$rewrite = 1; |
$rewrite = 1; |
Line 292 else {
|
Line 292 else {
|
} |
} |
} |
} |
if ($found >= @expected) { |
if ($found >= @expected) { |
$gotrules = 1; |
$gotrules = 1; |
} |
} |
} |
} |
} |
} |