diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php index 589f42f1..18316700 100644 --- a/actions/admin/settings/136.phpfpm.php +++ b/actions/admin/settings/136.phpfpm.php @@ -31,7 +31,7 @@ return array( 'overview_option' => true ), 'system_phpfpm_enabled_ownvhost' => array( - 'label' => $lng['serversettings']['phpfpm'], + 'label' => $lng['phpfpm']['ownvhost'], 'settinggroup' => 'phpfpm', 'varname' => 'enabled_ownvhost', 'type' => 'bool', @@ -39,7 +39,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_httpuser' => array( - 'label' => $lng['admin']['mod_fcgid_user'], + 'label' => $lng['phpfpm']['vhost_httpuser'], 'settinggroup' => 'phpfpm', 'varname' => 'vhost_httpuser', 'type' => 'string', @@ -47,7 +47,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_httpgroup' => array( - 'label' => $lng['admin']['mod_fcgid_group'], + 'label' => $lng['phpfpm']['vhost_httpgroup'], 'settinggroup' => 'phpfpm', 'varname' => 'vhost_httpgroup', 'type' => 'string', diff --git a/lib/tables.inc.php b/lib/tables.inc.php index c348ad6a..e14ed313 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.16-svn1'; +$version = '0.9.16-svn2'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index 927a5c35..4bf17c0b 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1543,3 +1543,7 @@ $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests p $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'For endless request processing specify \'0\'. Equivalent to PHP_FCGI_MAX_REQUESTS.'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM is currently active. Please deactivate it before activating FCGID'; $lng['error']['fcgidstillenabled'] = 'FCGID is currently active. Please deactivate it before activating PHP-FPM'; +$lng['phpfpm']['vhost_httpuser'] = 'Local user to use for PHP-FPM (Froxlor vHost)'; +$lng['phpfpm']['vhost_httpgroup'] = 'Local group to use for PHP-FPM (Froxlor vHost)'; +$lng['phpfpm']['ownvhost']['title'] = 'Enable PHP-FPM for the Froxlor vHost'; +$lng['phpfpm']['ownvhost']['description'] = 'If enabled, Froxlor will also be running under a local user'; diff --git a/lng/german.lng.php b/lng/german.lng.php index c7f471d7..d35845cc 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1525,3 +1525,7 @@ $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests p $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'Für keine Begrenzung \'0\' angeben. Equivalent zu PHP_FCGI_MAX_REQUESTS.'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM ist derzeit aktiviert. Bitte deaktiviere es, um FCGID zu aktivieren'; $lng['error']['fcgidstillenabled'] = 'FCGID ist derzeit aktiviert. Bitte deaktiviere es, um PHP-FPM zu aktivieren'; +$lng['phpfpm']['vhost_httpuser'] = 'Lokaler Benutzer für PHP-FPM (Froxlor Vhost)'; +$lng['phpfpm']['vhost_httpgroup'] = 'Lokale Gruppe für PHP-FPM (Froxlor Vhost)'; +$lng['phpfpm']['ownvhost']['title'] = 'Verwende PHP-FPM im Froxlor Vhost'; +$lng['phpfpm']['ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgeführt';