Use correct restart function, and also delete ipkeys properly

virtualmin · May 14, 2017 · c6d1863 · c6d1863
1 parent fe966e2
commit c6d1863
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/virtual_feature.pl b/virtual_feature.pl
@@ -250,15 +250,17 @@ sub feature_setup
 # Add this IP and cert to Webmin/Usermin's SSL keys list
 my %vinfo = &get_module_info("virtual-server");
 my $canipkeys = $d->{'virt'} || $vinfo{'version'} >= 5.08;
+my $rwfunc = $vinfo{'version'} >= 5.08 ? \&virtual_server::restart_webmin_fully
+				       : \&virtual_server::restart_webmin;
 if ($tmpl->{'web_webmin_ssl'} && $canipkeys) {
         &virtual_server::setup_ipkeys($d,
 		\&get_miniserv_config,
 		\&put_miniserv_config,
-		\&virtual_server::restart_webmin);
+		$rwfunc);
         }
 if ($tmpl->{'web_usermin_ssl'} && &foreign_installed("usermin") &&
     $canipkeys) {
-        &foreign_require("usermin", "usermin-lib.pl");
+        &foreign_require("usermin");
         &virtual_server::setup_ipkeys($d,
 		\&usermin::get_usermin_miniserv_config,
 		\&usermin::put_usermin_miniserv_config,
@@ -443,6 +445,22 @@ sub feature_delete
 &virtualmin_nginx::unlock_all_config_files();
 &virtual_server::register_post_action(\&virtualmin_nginx::print_apply_nginx);
 
+# Delete per-IP SSL cert
+my %vinfo = &get_module_info("virtual-server");
+my $rwfunc = $vinfo{'version'} >= 5.08 ? \&virtual_server::restart_webmin_fully
+				       : \&virtual_server::restart_webmin;
+&virtual_server::delete_ipkeys($d,
+	\&get_miniserv_config,
+	\&put_miniserv_config,
+	$rwfunc);
+if (&foreign_installed("usermin")) {
+        &foreign_require("usermin");
+        &virtual_server::delete_ipkeys($d,
+		\&usermin::get_usermin_miniserv_config,
+		\&usermin::put_usermin_miniserv_config,
+		\&virtual_server::restart_usermin);
+        }
+
 $d->{'web_ssl_samechain'} = 0;
 &$virtual_server::second_print($virtual_server::text{'setup_done'});
 }