Do the same thing with the SSL cert for Nginx restores that we do for…

… Apache restores
virtualmin · Mar 12, 2023 · 2e3d9c2 · 2e3d9c2
1 parent 123b087
commit 2e3d9c2
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/virtual_feature.pl b/virtual_feature.pl
@@ -2584,24 +2584,28 @@ sub feature_restore
 	&$virtual_server::second_print($virtual_server::text{'setup_done'});
 	}
 
-# Restore SSL cert and key
-my $cert = $d->{'ssl_cert'} || &feature_get_web_ssl_file($d, 'cert');
-my $key = $d->{'ssl_key'} || &feature_get_web_ssl_file($d, 'key');
-my $ca = $d->{'ssl_chain'} || &feature_get_web_ssl_file($d, 'ca');
-if ($cert && -r $file."_cert") {
-	&lock_file($cert);
-	&virtual_server::write_ssl_file_contents($d, $cert, $file."_cert");
-	&unlock_file($cert);
-	}
-if ($key && -r $file."_key") {
-	&lock_file($key);
-	&virtual_server::write_ssl_file_contents($d, $key, $file."_key");
-	&unlock_file($key);
-	}
-if ($ca && -r $file."_ca") {
-	&lock_file($ca);
-	&virtual_server::write_ssl_file_contents($d, $ca, $file."_ca");
-	&unlock_file($ca);
+# Restore SSL cert and key, unless shared
+if (!$d->{'ssl_same'}) {
+	my $cert = $d->{'ssl_cert'} || &feature_get_web_ssl_file($d, 'cert');
+	my $key = $d->{'ssl_key'} || &feature_get_web_ssl_file($d, 'key');
+	my $ca = $d->{'ssl_chain'} || &feature_get_web_ssl_file($d, 'ca');
+	if ($cert && -r $file."_cert") {
+		&lock_file($cert);
+		&virtual_server::write_ssl_file_contents($d, $cert, $file."_cert");
+		&unlock_file($cert);
+		}
+	if ($key && -r $file."_key") {
+		&lock_file($key);
+		&virtual_server::write_ssl_file_contents($d, $key, $file."_key");
+		&unlock_file($key);
+		}
+	if ($ca && -r $file."_ca") {
+		&lock_file($ca);
+		&virtual_server::write_ssl_file_contents($d, $ca, $file."_ca");
+		&unlock_file($ca);
+		}
+	&virtual_server::refresh_ssl_cert_expiry($d);
+	&virtual_server::sync_combined_ssl_cert($d);
 	}
 
 return 1;