Handle username change in FPM mode

virtualmin · Jan 8, 2017 · a3b6aa2 · a3b6aa2
1 parent 3f3d308
commit a3b6aa2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/virtual_feature.pl b/virtual_feature.pl
@@ -531,15 +531,21 @@ sub feature_modify
 
 	# Update fcgid user, by tearing down and re-running. Killing needs to
 	# be done in the new home, as it may have been moved already
-	# XXX fpm mode
 	if ($d->{'user'} ne $oldd->{'user'} ||
 	    $d->{'home'} ne $oldd->{'home'}) {
 		&$virtual_server::first_print($text{'feat_modifyphp'});
 		my $oldd_copy = { %$oldd };
-		$oldd_copy->{'home'} = $d->{'home'};
-		&delete_php_fcgi_server($oldd_copy);
-		&delete_php_fcgi_server($oldd);
-		&setup_php_fcgi_server($d);
+		my $mode = &feature_get_web_php_mode($d);
+		if ($mode eq "fcgid") {
+			$oldd_copy->{'home'} = $d->{'home'};
+			&delete_php_fcgi_server($oldd_copy);
+			&delete_php_fcgi_server($oldd);
+			&setup_php_fcgi_server($d);
+			}
+		elsif ($mode eq "fpm") {
+			&virtual_server::delete_php_fpm_pool($oldd);
+			&virtual_server::create_php_fpm_pool($d);
+			}
 		&$virtual_server::second_print(
 			$virtual_server::text{'setup_done'});
 		}