Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
72ce7888
Commit
72ce7888
authored
Sep 21, 2011
by
Falko Timme
Browse files
Added support for PHP-FPM sockets.
parent
2023a790
Changes
24
Hide whitespace changes
Inline
Side-by-side
install/dist/conf/centos52.conf.php
View file @
72ce7888
...
...
@@ -192,6 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm';
$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'
;
...
...
install/dist/conf/centos53.conf.php
View file @
72ce7888
...
...
@@ -192,6 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm';
$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'
;
...
...
install/dist/conf/debian40.conf.php
View file @
72ce7888
...
...
@@ -204,6 +204,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
$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
;
...
...
install/dist/conf/debian60.conf.php
View file @
72ce7888
...
...
@@ -204,6 +204,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
$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
;
...
...
install/dist/conf/fedora9.conf.php
View file @
72ce7888
...
...
@@ -192,6 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm';
$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'
;
...
...
install/dist/conf/gentoo.conf.php
View file @
72ce7888
...
...
@@ -208,6 +208,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
$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'
;
...
...
install/dist/conf/opensuse110.conf.php
View file @
72ce7888
...
...
@@ -192,6 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm';
$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'
;
...
...
install/dist/conf/opensuse112.conf.php
View file @
72ce7888
...
...
@@ -192,6 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm';
$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'
;
...
...
install/lib/installer_base.lib.php
View file @
72ce7888
...
...
@@ -243,6 +243,7 @@ class installer_base {
$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'
;
}
...
...
install/lib/update.lib.php
View file @
72ce7888
...
...
@@ -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'
;
}
...
...
install/sql/incremental/upd_0021.sql
0 → 100644
View file @
72ce7888
ALTER
TABLE
`web_domain`
ADD
`php_fpm_use_socket`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
AFTER
`nginx_directives`
;
\ No newline at end of file
install/sql/ispconfig3.sql
View file @
72ce7888
...
...
@@ -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'
,
...
...
install/tpl/server.ini.master
View file @
72ce7888
...
...
@@ -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
...
...
interface/web/admin/form/server_config.tform.php
View file @
72ce7888
...
...
@@ -548,6 +548,17 @@ $form["tabs"]['web'] = array(
'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'
,
...
...
interface/web/admin/lib/lang/de_server_config.lng
View file @
72ce7888
...
...
@@ -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.'
;
?>
interface/web/admin/lib/lang/en_server_config.lng
View file @
72ce7888
...
...
@@ -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'
;
...
...
interface/web/admin/templates/server_config_web_edit.htm
View file @
72ce7888
...
...
@@ -108,6 +108,10 @@
<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>
...
...
interface/web/sites/form/web_domain.tform.php
View file @
72ce7888
...
...
@@ -488,6 +488,12 @@ $form["tabs"]['advanced'] = array (
'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'
,
...
...
interface/web/sites/lib/lang/de_web_domain.lng
View file @
72ce7888
...
...
@@ -76,4 +76,5 @@ $wb['nginx_directives_txt'] = 'nginx Direktiven';
$wb
[
"seo_redirect_txt"
]
=
'SEO Redirect'
;
$wb
[
"non_www_to_www_txt"
]
=
'Nicht-www -> www'
;
$wb
[
"www_to_non_www_txt"
]
=
'www -> Nicht-www'
;
$wb
[
"php_fpm_use_socket_txt"
]
=
'Benutze Socket für PHP-FPM'
;
?>
interface/web/sites/lib/lang/en_web_domain.lng
View file @
72ce7888
...
...
@@ -76,4 +76,5 @@ $wb["nginx_directives_txt"] = 'nginx Directives';
$wb
[
"seo_redirect_txt"
]
=
'SEO Redirect'
;
$wb
[
"non_www_to_www_txt"
]
=
'Non-www -> www'
;
$wb
[
"www_to_non_www_txt"
]
=
'www -> non-www'
;
$wb
[
"php_fpm_use_socket_txt"
]
=
'Use Socket For PHP-FPM'
;
?>
\ No newline at end of file
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment