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

config-Oracle-Linux-8.0-ALL

@@ -0,0 +1,9 @@
+nginx_config=/etc/nginx/nginx.conf
+nginx_cmd=/usr/sbin/nginx
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
+child_procs=4
+php_socket=1
+listen_mode=1
+proxy_websockets=0

config-Redhat-Enterprise-Linux-7.0-ALL

@@ -1,8 +1,8 @@
 nginx_config=/etc/nginx/nginx.conf
 nginx_cmd=/usr/sbin/nginx
-start_cmd=service nginx start
-stop_cmd=service nginx stop
-apply_cmd=service nginx restart
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
 child_procs=4
 php_socket=1
 listen_mode=1

config-Rocky-Linux-7.0-ALL

@@ -0,0 +1,9 @@
+nginx_config=/etc/nginx/nginx.conf
+nginx_cmd=/usr/sbin/nginx
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
+child_procs=4
+php_socket=1
+listen_mode=1
+proxy_websockets=0

config-Ubuntu-Linux-18.04-ALL

@@ -0,0 +1,11 @@
+nginx_config=/etc/nginx/nginx.conf
+nginx_cmd=/usr/sbin/nginx
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
+add_to=/etc/nginx/sites-available
+add_link=/etc/nginx/sites-enabled
+child_procs=4
+php_socket=1
+listen_mode=1
+proxy_websockets=0

config-debian-linux

@@ -1,8 +1,8 @@
 nginx_config=/etc/nginx/nginx.conf
 nginx_cmd=/usr/sbin/nginx
-start_cmd=service nginx start
-stop_cmd=service nginx stop
-apply_cmd=service nginx restart
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
 add_to=/etc/nginx/sites-available
 add_link=/etc/nginx/sites-enabled
 child_procs=4

config-debian-linux-10.0-ALL

@@ -0,0 +1,11 @@
+nginx_config=/etc/nginx/nginx.conf
+nginx_cmd=/usr/sbin/nginx
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
+add_to=/etc/nginx/sites-available
+add_link=/etc/nginx/sites-enabled
+child_procs=4
+php_socket=1
+listen_mode=1
+proxy_websockets=0

config-redhat-linux

@@ -1,8 +1,8 @@
 nginx_config=/etc/nginx/nginx.conf
 nginx_cmd=/usr/sbin/nginx
-start_cmd=/etc/init.d/nginx start
-stop_cmd=/etc/init.d/nginx stop
-apply_cmd=/etc/init.d/nginx restart
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl restart nginx
 child_procs=4
 php_socket=1
 listen_mode=1

module.info

@@ -1,4 +1,4 @@
 desc=Nginx Webserver
 category=servers
-version=2.25
+version=2.26
 readonly=1

virtual_feature.pl

@@ -1077,6 +1077,7 @@ sub feature_links
 my $mode = &feature_get_web_php_mode($d);
 if ($mode eq "fcgid") {
 	# Link to edit per-version php.ini files
+	my @dirs = &virtual_server::list_domain_php_directories($d);
 	foreach my $ini (&virtual_server::find_domain_php_ini_files($d)) {
 		push(@rv, { 'mod' => 'phpini',
 			    'desc' => $ini->[0] ?
@@ -1085,12 +1086,12 @@ sub feature_links
 			    'page' => 'list_ini.cgi?file='.
 					&urlize($ini->[1]),
 			    'cat' => 'services',
-			  });
+			  }) if ($dirs[0]->{'version'} == $ini->[0]);
 		}
 	}
 elsif ($mode eq "fpm") {
 	# Link to edit FPM configs with PHP settings
-	my $conf = &virtual_server::get_php_fpm_config();
+	my $conf = &virtual_server::get_php_fpm_config($d);
 	if ($conf) {
 		my $file = $conf->{'dir'}."/".$d->{'id'}.".conf";
 		push(@rv, { 'mod' => 'phpini',

virtualmin-nginx-lib.pl

@@ -467,10 +467,10 @@ sub join_words
 	if ($w eq "") {
 		push(@rv, '""');
 		}
-	elsif ($w =~ /\s|;|\$/ && $w !~ /"/) {
+	elsif ($w =~ /\s|;|\$/ && $w !~ /"/ && $w !~ /^\$/) {
 		push(@rv, "\"$w\"");
 		}
-	elsif ($w =~ /\s|;|\$/) {
+	elsif ($w =~ /\s|;|\$/ && $w !~ /^\$/) {
 		push(@rv, "'$w'");
 		}
 	else {