Merge branch '6181-fix-fpm-socket-dir' into 'develop'

Marius Burkard · Marius Burkard · commit 22bef49db8fe · 2021-09-08T07:47:27.000Z
6181-fix-fpm-socket-dir:  Fix socket dir for additional php versions

Closes #6181

See merge request ispconfig/ispconfig3!1490
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1649,7 +1649,7 @@ function update($event_name, $data) {
 					$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];
 					$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];
 					$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];
-					$custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];
+					$custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];
 					if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';
 				}
 			}
@@ -1661,7 +1661,7 @@ function update($event_name, $data) {
 					$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];
 					$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];
 					$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];
-					$custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];
+					$custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];
 					if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1649,7 +1649,7 @@ function update($event_name, $data) {`
`1649`	`1649`	`$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];`
`1650`	`1650`	`$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];`
`1651`	`1651`	`$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];`
`1652`		`- $custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];`
	`1652`	`+ $custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];`
`1653`	`1653`	`if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';`
`1654`	`1654`	`}`
`1655`	`1655`	`}`
`@@ -1661,7 +1661,7 @@ function update($event_name, $data) {`
`1661`	`1661`	`$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];`
`1662`	`1662`	`$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];`
`1663`	`1663`	`$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];`
`1664`		`- $custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];`
	`1664`	`+ $custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];`
`1665`	`1665`	`if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';`
`1666`	`1666`	`}`
`1667`	`1667`	`}`