Skip to content

Commit 9e8048f

Browse files
author
Webslice
committed
Add option to enable chrooted PHP-FPM by default per server
1 parent 48f2ae5 commit 9e8048f

29 files changed

+50
-6
lines changed

install/tpl/server.ini.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ overquota_db_notify_client=y
121121
overquota_notify_onok=n
122122
logging=yes
123123
php_fpm_reload_mode=reload
124+
php_fpm_default_chroot=n
124125

125126
[dns]
126127
bind_user=root

interface/web/admin/form/server_config.tform.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,12 @@
12741274
'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM'),
12751275
'searchable' => 2
12761276
),
1277+
'php_fpm_default_chroot' => array(
1278+
'datatype' => 'VARCHAR',
1279+
'formtype' => 'CHECKBOX',
1280+
'default' => 'n',
1281+
'value' => array(0 => 'n', 1 => 'y')
1282+
),
12771283
'php_fpm_incron_reload' => array(
12781284
'datatype' => 'VARCHAR',
12791285
'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/ar_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
264264
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
265265
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
266266
$wb['php_handler_txt'] = 'Default PHP Handler';
267+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
267268
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
268269
$wb['disabled_txt'] = 'Disabled';
269270
$wb['dkim_strength_txt'] = 'DKIM strength';

interface/web/admin/lib/lang/bg_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
264264
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
265265
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
266266
$wb['php_handler_txt'] = 'Default PHP Handler';
267+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
267268
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
268269
$wb['disabled_txt'] = 'Disabled';
269270
$wb['dkim_strength_txt'] = 'DKIM strength';

interface/web/admin/lib/lang/br_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ $wb['overquota_db_notify_admin_txt'] = 'Enviar alerta da cota do banco de dados
215215
$wb['overquota_db_notify_client_txt'] = 'Enviar alerta da cota do banco de dados para o cliente';
216216
$wb['monitor_system_updates_txt'] = 'Verificar por atualizações do sistema';
217217
$wb['php_handler_txt'] = 'Manipulador padrão do php';
218+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
218219
$wb['php_fpm_incron_reload_txt'] = 'Instale o arquivo de disparo do incron para recarregar o php-fpm.';
219220
$wb['disabled_txt'] = 'Desabilitado';
220221
$wb['dkim_strength_txt'] = 'Dificuldade do DKIM';

interface/web/admin/lib/lang/ca_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ $wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
211211
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
212212
$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
213213
$wb['php_handler_txt'] = 'Default PHP Handler';
214+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
214215
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
215216
$wb['disabled_txt'] = 'Disabled';
216217
$wb['dkim_strength_txt'] = 'DKIM strength';

interface/web/admin/lib/lang/cz_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ $wb['backup_delete_txt'] = 'Odstranit zálohy pokud byla smazána doména/webov
260260
$wb['overquota_db_notify_admin_txt'] = 'Poslat varování o překročení nebo vyčerpání DB kvót adminovi';
261261
$wb['overquota_db_notify_client_txt'] = 'Poslat varování o překročení nebo vyčerpání DB kvót klientovi';
262262
$wb['php_handler_txt'] = 'Výchozí PHP obslužná rutina';
263+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
263264
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
264265
$wb['disabled_txt'] = 'Vypnuto';
265266
$wb['php_ini_check_minutes_txt'] = 'Provádět kontrolu změny obsahu souboru php.ini každých X minut';

interface/web/admin/lib/lang/de_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ $wb['php_ini_check_minutes_txt'] = 'Prüfe php.ini alle X Minuten auf Änderunge
270270
$wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie oft die php.ini auf Änderungen geprüft werden soll.';
271271
$wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
272272
$wb['php_handler_txt'] = 'Standard-PHP-Handler';
273+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
273274
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
274275
$wb['enable_spdy_txt'] = 'Stellt SPDY/HTTP2 zur Verfügung';
275276
$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';

interface/web/admin/lib/lang/dk_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
263263
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
264264
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
265265
$wb['php_handler_txt'] = 'Default PHP Handler';
266+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
266267
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
267268
$wb['disabled_txt'] = 'Disabled';
268269
$wb['dkim_strength_txt'] = 'DKIM strength';

interface/web/admin/lib/lang/el_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
264264
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
265265
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
266266
$wb['php_handler_txt'] = 'Default PHP Handler';
267+
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';
267268
$wb['php_fpm_incron_reload_txt'] = 'Install incron trigger file to reload PHP-FPM';
268269
$wb['disabled_txt'] = 'Disabled';
269270
$wb['dkim_strength_txt'] = 'DKIM strength';

0 commit comments

Comments
 (0)