Skip to content

Commit

Permalink
Merge branch 'master' of github.com:virtualmin/virtualmin-nginx-ssl
Browse files Browse the repository at this point in the history
  • Loading branch information
jcameron committed Sep 10, 2021
2 parents a89a032 + c5a9de9 commit bb09fab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion module.info
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
desc=Nginx Webserver SSL
category=servers
version=1.14
version=1.15
readonly=1
depends=virtualmin-nginx virtual-server
hidden=1
6 changes: 3 additions & 3 deletions virtual_feature.pl
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ sub feature_setup
}
my @sslopts = ( 'ssl' );
push(@sslopts, "http2") if ($virtualmin_nginx::config{'http2'});
if ($virtualmin_nginx::config{'listen_mode'}) {
if ($virtualmin_nginx::config{'listen_mode'} eq '0') {
# Listen on all IPs
if (!$old_ip4 && !$old_ip6) {
push(@listen, { 'name' => 'listen',
Expand Down Expand Up @@ -491,7 +491,7 @@ sub feature_validate
$l =~ /^\Q$d->{'ip'}\E:(\d+)$/ &&
$d->{'web_sslport'} == $1);
$found++ if ($l eq $d->{'web_sslport'} &&
$virtualmin_nginx::config{'listen_mode'});
$virtualmin_nginx::config{'listen_mode'} eq '0');
}
$found || return &virtualmin_nginx::text('feat_evalidateip',
$d->{'ip'}, $d->{'web_sslport'});
Expand All @@ -503,7 +503,7 @@ sub feature_validate
$l =~ /^\[\Q$d->{'ip6'}\E\]:(\d+)$/ &&
$d->{'web_sslport'} == $1);
$found6++ if ($l eq $d->{'web_sslport'} &&
$virtualmin_nginx::config{'listen_mode'});
$virtualmin_nginx::config{'listen_mode'} eq '0');
}
$found6 || return &virtualmin_nginx::text('feat_evalidateip6',
$d->{'ip6'}, $d->{'web_sslport'});
Expand Down

0 comments on commit bb09fab

Please sign in to comment.