Merge branch 'master' of github.com:virtualmin/virtualmin-nginx

lang/en

@@ -441,9 +441,9 @@ feat_ephpdirver=The PHP version cannot be changed to any version except the defa
 feat_ephpdirdelete=The PHP version cannot be removed for Nginx websites
 feat_manage=Configure Nginx
 feat_sname=Nginx Webserver
-feat_sstop=Stop Nginx Webserver
-feat_srestart=Restart Nginx Webserver
-feat_sstart=Start Nginx Webserver
+feat_sstop=Stop Nginx webserver
+feat_srestart=Restart Nginx webserver
+feat_sstart=Start Nginx webserver
 feat_sstopdesc=The Nginx webserver is currently active, and serving virtual server web pages. Click this button to shut it down.
 feat_sstartdesc=The Nginx webserver is currently down, meaning that all virtual server web pages are inaccessible. Click this button to start it.
 feat_backup=Backing up Nginx webserver configuration ..

virtual_feature.pl

@@ -1975,17 +1975,6 @@ sub feature_create_web_balancer
 	my $p = $balancer->{'path'};
 	if ($p ne '/') {
 		$p =~ s/\/$//;
-		push(@{$l->{'members'}},
-		     { 'name' => 'rewrite',
-		       'words' => [ '^'.$p.'$', $p.'/', 'redirect' ],
-		     },
-		     { 'name' => 'rewrite',
-		       'words' => [ '^'.$p.'(/.*)', '$1', 'break' ],
-		     },
-		     { 'name' => 'proxy_redirect',
-		       'words' => [ $url, $p ],
-		     },
-		    );
 		}
 	push(@{$l->{'members'}},
 	     { 'name' => 'proxy_pass',
@@ -2075,25 +2064,6 @@ sub feature_modify_web_balancer
 	&save_directive($l, "proxy_pass", \@urls);
 	$url = @urls ? $urls[0] : undef;
 	}
-if (@urls && $balancer->{'path'} ne '/') {
-	# Add rewrites for the path
-	my $p = $balancer->{'path'};
-	$p =~ s/\/$//;
-	&save_directive($l, 'rewrite',
-	     { 'name' => 'rewrite',
-	       'words' => [ '^'.$p.'$', $p.'/', 'redirect' ],
-	     },
-	     { 'name' => 'rewrite',
-	       'words' => [ '^'.$p.'(/.*)', '$1', 'break' ],
-	     },
-	     { 'name' => 'proxy_redirect',
-	       'words' => [ $url, $p ],
-	     },
-	     );
-	}
-esle {
-	&save_directive($l, 'rewrite', [ ]);
-	}
 &flush_config_file_lines();
 &unlock_all_config_files();
 &virtual_server::register_post_action(\&print_apply_nginx);