Added support for PHP-FPM sockets.

falkotimme · falkotimme · commit 72ce788832f0 · 2011-09-21T11:28:59.000Z
diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php
@@ -192,6 +192,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php
@@ -192,6 +192,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php
@@ -204,6 +204,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //*Ufw
 $conf['ufw']['installed'] = false;
diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
@@ -204,6 +204,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* Ufw
 $conf['ufw']['installed'] = false;
diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php
@@ -192,6 +192,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php
@@ -208,6 +208,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc/vlogger';
diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php
@@ -192,6 +192,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php
@@ -192,6 +192,7 @@
 $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
 $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm';
 $conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';
 
 //* vlogger
 $conf['vlogger']['config_dir'] = '/etc';
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -243,6 +243,7 @@ public function add_database_server_record() {
 			$tpl_ini_array['web']['php_fpm_ini_path'] = $conf['nginx']['php_fpm_ini_path'];
 			$tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];
 			$tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];
+			$tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
 			$tpl_ini_array['web']['server_type'] = 'nginx';
 			$tpl_ini_array['global']['webserver'] = 'nginx';
 		}
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
@@ -270,6 +270,7 @@ function updateDbAndIni() {
 		$tpl_ini_array['web']['php_fpm_ini_path'] = $conf['nginx']['php_fpm_ini_path'];
 		$tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];
 		$tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];
+		$tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
 		$tpl_ini_array['web']['server_type'] = 'nginx';
 		$tpl_ini_array['global']['webserver'] = 'nginx';
 	}
diff --git a/install/sql/incremental/upd_0021.sql b/install/sql/incremental/upd_0021.sql
@@ -0,0 +1 @@
+ALTER TABLE `web_domain` ADD `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `nginx_directives`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -1510,6 +1510,7 @@ CREATE TABLE `web_domain` (
   `allow_override` varchar(255) NOT NULL default 'All',
   `apache_directives` mediumtext,
   `nginx_directives` mediumtext,
+  `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n'
   `php_open_basedir` mediumtext,
   `custom_php_ini` mediumtext,
   `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
@@ -66,6 +66,7 @@ php_fpm_init_script=php5-fpm
 php_fpm_ini_path=/etc/php5/fpm/php.ini
 php_fpm_pool_dir=/etc/php5/fpm/pool.d
 php_fpm_start_port=9010
+php_fpm_socket_dir=/var/run/php5-fpm
 
 [dns]
 bind_user=root
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -548,6 +548,17 @@
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'php_fpm_socket_dir' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'validators' => array(0 => array('type' => 'NOTEMPTY',
+					'errmsg' => 'php_fpm_socket_dir_error_empty'),
+			),
+			'value' => '',
+			'width' => '40',
+			'maxlength' => '255'
+		),
 		'php_open_basedir' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
@@ -139,4 +139,6 @@ $wb["php_fpm_pool_dir_txt"] = 'PHP-FPM pool Verzeichnis';
 $wb["php_fpm_pool_dir_error_empty"] = 'PHP-FPM pool Verzeichnis ist leer.';
 $wb["php_fpm_start_port_txt"] = 'PHP-FPM Start-Port';
 $wb["php_fpm_start_port_error_empty"] = 'PHP-FPM Start-Port ist leer.';
+$wb["php_fpm_socket_dir_txt"] = 'PHP-FPM Socket-Verzeichnis';
+$wb["php_fpm_socket_dir_error_empty"] = 'PHP-FPM Socket-Verzeichnis ist leer.';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
@@ -141,6 +141,8 @@ $wb["php_fpm_pool_dir_txt"] = 'PHP-FPM pool directory';
 $wb["php_fpm_pool_dir_error_empty"] = 'PHP-FPM pool directory is empty.';
 $wb["php_fpm_start_port_txt"] = 'PHP-FPM start port';
 $wb["php_fpm_start_port_error_empty"] = 'PHP-FPM start port is empty.';
+$wb["php_fpm_socket_dir_txt"] = 'PHP-FPM socket directory';
+$wb["php_fpm_socket_dir_error_empty"] = 'PHP-FPM socket directory is empty.';
 $wb["try_rescue_txt"] = 'Enable service monitoring and restart on failure';
 $wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring';
 $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
@@ -108,6 +108,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
 	  <div class="ctrlHolder nginx">
       	<label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
         <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
+	  </div>
+	  <div class="ctrlHolder nginx">
+      	<label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+        <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
 	  </div>
 	  <div class="ctrlHolder">
       	<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
@@ -488,6 +488,12 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'php_fpm_use_socket' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 		'php_open_basedir' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -76,4 +76,5 @@ $wb['nginx_directives_txt'] = 'nginx Direktiven';
 $wb["seo_redirect_txt"] = 'SEO Redirect';
 $wb["non_www_to_www_txt"] = 'Nicht-www -&gt; www';
 $wb["www_to_non_www_txt"] = 'www -&gt; Nicht-www';
+$wb["php_fpm_use_socket_txt"] = 'Benutze Socket f&uuml;r PHP-FPM';
 ?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -76,4 +76,5 @@ $wb["nginx_directives_txt"] = 'nginx Directives';
 $wb["seo_redirect_txt"] = 'SEO Redirect';
 $wb["non_www_to_www_txt"] = 'Non-www -&gt; www';
 $wb["www_to_non_www_txt"] = 'www -&gt; non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
 ?>
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
@@ -20,6 +20,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
       	<label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
         <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
 	  </div>
+	  <div class="ctrlHolder nginx">
+				<p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='php_fpm_use_socket'}
+					</div>
+			</div>
 	  <div class="ctrlHolder">
       	<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
         <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput"  style="width:400px;" />
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
@@ -75,7 +75,8 @@ server {
 		
         location ~ \.php$ {
             try_files $uri =404;
-            fastcgi_pass 127.0.0.1:<tmpl_var name='fpm_port'>;
+            <tmpl_var name='use_tcp'>fastcgi_pass 127.0.0.1:<tmpl_var name='fpm_port'>;
+            <tmpl_var name='use_socket'>fastcgi_pass unix:<tmpl_var name='fpm_socket'>;
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $fastcgi_script_name;
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
@@ -1,8 +1,12 @@
 [<tmpl_var name='fpm_pool'>]
 
-listen = 127.0.0.1:<tmpl_var name='fpm_port'>
+<tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'>
+<tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1
 
-listen.allowed_clients = 127.0.0.1
+<tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'>
+<tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'>
+<tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'>
+<tmpl_var name='use_socket'>listen.mode = 0660
 
 user = <tmpl_var name='fpm_user'>
 group = <tmpl_var name='fpm_group'>
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ public function add_database_server_record() {`
`243`	`243`	`$tpl_ini_array['web']['php_fpm_ini_path'] = $conf['nginx']['php_fpm_ini_path'];`
`244`	`244`	`$tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];`
`245`	`245`	`$tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];`
	`246`	`+ $tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];`
`246`	`247`	`$tpl_ini_array['web']['server_type'] = 'nginx';`
`247`	`248`	`$tpl_ini_array['global']['webserver'] = 'nginx';`
`248`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ function updateDbAndIni() {`
`270`	`270`	`$tpl_ini_array['web']['php_fpm_ini_path'] = $conf['nginx']['php_fpm_ini_path'];`
`271`	`271`	`$tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];`
`272`	`272`	`$tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];`
	`273`	`+ $tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];`
`273`	`274`	`$tpl_ini_array['web']['server_type'] = 'nginx';`
`274`	`275`	`$tpl_ini_array['global']['webserver'] = 'nginx';`
`275`	`276`	`}`