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

virtualmin · Sep 30, 2023 · cf72df7 · cf72df7
2 parents 04e055a + 6e1b125
commit cf72df7
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 17 deletions.
diff --git a/config-AlmaLinux-7.0-ALL b/config-AlmaLinux-7.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-CentOS-Linux-7.0-ALL b/config-CentOS-Linux-7.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-CentOS-Stream-Linux-8.0-ALL b/config-CentOS-Stream-Linux-8.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-Oracle-Linux-8.0-ALL b/config-Oracle-Linux-8.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-Redhat-Enterprise-Linux-7.0-ALL b/config-Redhat-Enterprise-Linux-7.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-Rocky-Linux-7.0-ALL b/config-Rocky-Linux-7.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/config-debian-linux b/config-debian-linux
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 add_to=/etc/nginx/sites-available
 add_link=/etc/nginx/sites-enabled
 child_procs=4

diff --git a/config-debian-linux-10.0-ALL b/config-debian-linux-10.0-ALL
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 add_to=/etc/nginx/sites-available
 add_link=/etc/nginx/sites-enabled
 child_procs=4

diff --git a/config-openSUSE-Linux-15.0-ALL b/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,8 @@
+nginx_config=/etc/nginx/nginx.conf
+nginx_cmd=/usr/sbin/nginx
+start_cmd=systemctl start nginx
+stop_cmd=systemctl stop nginx
+apply_cmd=systemctl reload nginx
+child_procs=4
+php_socket=1
+listen_mode=1
diff --git a/config-redhat-linux b/config-redhat-linux
@@ -2,7 +2,7 @@ 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
+apply_cmd=systemctl reload nginx
 child_procs=4
 php_socket=1
 listen_mode=1
diff --git a/module.info b/module.info
@@ -1,4 +1,4 @@
 desc=Nginx Webserver
 category=servers
-version=2.30
+version=2.32
 readonly=1
diff --git a/virtual_feature.pl b/virtual_feature.pl
@@ -253,7 +253,8 @@ sub feature_setup
 	&$virtual_server::second_print($virtual_server::text{'setup_done'});
 
 	# Set up fcgid or FPM server
-	my $mode = &virtual_server::template_to_php_mode($tmpl);
+	my $mode = $d->{'default_php_mode'} || &virtual_server::template_to_php_mode($tmpl);
+	delete($d->{'default_php_mode'});
 	&$virtual_server::first_print($text{'feat_php'.$mode});
 
 	# Create initial config block for running PHP scripts. The port gets
@@ -832,12 +833,8 @@ sub feature_disable
 		# Disable is done via default website page
 		my $def_tpl = &read_file_contents("$virtual_server::default_content_dir/index.html");
 		my %hashtmp = %$d;
-		$hashtmp{'TMPLTTITLE'} = $virtual_server::text{'deftmplt_website_disabled'};
-		$hashtmp{'TMPLTSLOGAN'} = $virtual_server::text{'deftmplt_disable_slog'};
-		if ($d->{'disabled_why'}) {
-			$hashtmp{'TMPLTCONTENT'} = $d->{'disabled_why'};
-			}
-		%hashtmp = &virtual_server::populate_default_index_page(%hashtmp);
+		%hashtmp = &virtual_server::populate_default_index_page($d, %hashtmp);
+		$def_tpl = &virtual_server::replace_default_index_page($d, $def_tpl);
 		$def_tpl = &virtual_server::substitute_virtualmin_template($def_tpl, \%hashtmp);
 		my $msg = $tmpl->{'disabled_web'} eq 'none' ?
 			$def_tpl :
@@ -2892,6 +2889,7 @@ sub set_nginx_log_permissions
 sub domain_server_names
 {
 my ($d) = @_;
+return split(/\s+/, $d->{'dom_defnames'}) if ($d->{'dom_defnames'});
 return ( $d->{'dom'}, "www.".$d->{'dom'}, "mail.".$d->{'dom'} );
 }