From a89a03246ff01f939839649a4d1c4e25c3066681 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 10 Sep 2021 15:51:56 -0700
Subject: [PATCH] Don't use default where not strictly needed

---
 virtual_feature.pl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/virtual_feature.pl b/virtual_feature.pl
index c584273..f6e733f 100644
--- a/virtual_feature.pl
+++ b/virtual_feature.pl
@@ -216,13 +216,7 @@ sub feature_setup
 	($old_ip6) = grep { $_->{'words'}->[0] eq
 		       "[".$d->{'ip6'}."]:".$d->{'web_sslport'} } @listen;
 	}
-my @sslopts;
-if (!&find_listen_clash($d->{'ip'}, $d->{'web_sslport'})) {
-	push(@sslopts, 'default', 'ssl');
-	}
-else {
-	push(@sslopts, 'ssl');
-	}
+my @sslopts = ( 'ssl' );
 push(@sslopts, "http2") if ($virtualmin_nginx::config{'http2'});
 if ($virtualmin_nginx::config{'listen_mode'}) {
 	# Listen on all IPs
@@ -240,6 +234,7 @@ sub feature_setup
 					     @sslopts ] });
 		}
 	if (!$old_ip6 && $d->{'ip6'}) {
+		push(@sslopts, &virtualmin_nginx::get_default_server_param());
 		push(@listen, { 'name' => 'listen',
 				'words' => [ "[".$d->{'ip6'}."]:".$d->{'web_sslport'},
 					     @sslopts ]});