diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php
index a62f0c2f..c8b6e0ea 100644
--- a/actions/admin/settings/136.phpfpm.php
+++ b/actions/admin/settings/136.phpfpm.php
@@ -69,6 +69,17 @@ return array(
'default' => '/usr/share/php/:/usr/share/php5/',
'save_method' => 'storeSettingField'
),
+ 'system_phpfpm_envpath' => array(
+ 'label' => $lng['serversettings']['phpfpm_settings']['envpath'],
+ 'settinggroup' => 'phpfpm',
+ 'varname' => 'envpath',
+ 'type' => 'string',
+ 'string_type' => 'dir',
+ 'string_delimiter' => ':',
+ 'string_emptyallowed' => true,
+ 'default' => '/usr/local/bin:/usr/bin:/bin',
+ 'save_method' => 'storeSettingField'
+ ),
'system_phpfpm_fastcgi_ipcdir' => array(
'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
'settinggroup' => 'phpfpm',
diff --git a/install/froxlor.sql b/install/froxlor.sql
index 1bd72d32..a54798a4 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -414,6 +414,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('phpfpm', 'max_requests', '0'),
('phpfpm', 'tmpdir', '/var/customers/tmp/'),
('phpfpm', 'peardir', '/usr/share/php/:/usr/share/php5/'),
+ ('phpfpm', 'envpath', '/usr/local/bin:/usr/bin:/bin'),
('phpfpm', 'enabled_ownvhost', '0'),
('phpfpm', 'vhost_httpuser', 'froxlorlocal'),
('phpfpm', 'vhost_httpgroup', 'froxlorlocal'),
@@ -686,7 +687,7 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''),
('panel', 'version', '0.9.38.8'),
- ('panel', 'db_version', '201801110');
+ ('panel', 'db_version', '201801260');
DROP TABLE IF EXISTS `panel_tasks`;
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index e9e1e39e..6c9fa665 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3865,3 +3865,12 @@ opcache.interned_strings_buffer');
updateToDbVersion('201801110');
}
+
+if (isDatabaseVersion('201801110')) {
+
+ showUpdateStep("Adding php-fpm php PATH setting for envrironment");
+ Settings::AddNew("phpfpm.envpath", '/usr/local/bin:/usr/bin:/bin');
+ lastStepStatus(0);
+
+ updateToDbVersion('201801260');
+}
diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php
index f72a2410..daf358ad 100644
--- a/lib/classes/phpinterface/class.phpinterface_fpm.php
+++ b/lib/classes/phpinterface/class.phpinterface_fpm.php
@@ -169,6 +169,10 @@ class phpinterface_fpm
$this->getTempDir();
}
+ $env_path = Settings::Get('phpfpm.envpath');
+ if (!empty($env_path)) {
+ $fpm_config .= 'env[PATH] = ' . $env_path . "\n";
+ }
$fpm_config .= 'env[TMP] = ' . $tmpdir . "\n";
$fpm_config .= 'env[TMPDIR] = ' . $tmpdir . "\n";
$fpm_config .= 'env[TEMP] = ' . $tmpdir . "\n";
diff --git a/lib/version.inc.php b/lib/version.inc.php
index 4f1da38b..5ebe2f3b 100644
--- a/lib/version.inc.php
+++ b/lib/version.inc.php
@@ -19,7 +19,7 @@
$version = '0.9.38.8';
// Database version (YYYYMMDDC where C is a daily counter)
-$dbversion = '201801110';
+$dbversion = '201801260';
// Distribution branding-tag (used for Debian etc.)
$branding = '';
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 831893f2..bb58842e 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -2100,3 +2100,5 @@ $lng['phpfpm']['ini_flags'] = 'Enter possible php_flags for php
$lng['phpfpm']['ini_values'] = 'Enter possible php_values for php.ini. One entry per line';
$lng['phpfpm']['ini_admin_flags'] = 'Enter possible php_admin_flags for php.ini. One entry per line';
$lng['phpfpm']['ini_admin_values'] = 'Enter possible php_admin_values for php.ini. One entry per line';
+$lng['serversettings']['phpfpm_settings']['envpath'] = 'Paths to add to the PATH environment. Leave empty for no PATH environment variable';
+
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 9ccfa6da..b822aa3b 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1751,3 +1751,4 @@ $lng['phpfpm']['ini_flags'] = 'Mögliche php_flags für die php
$lng['phpfpm']['ini_values'] = 'Mögliche php_values für die php.ini. Pro Zeile eine Direktive';
$lng['phpfpm']['ini_admin_flags'] = 'Mögliche php_admin_flags für die php.ini. Pro Zeile eine Direktive';
$lng['phpfpm']['ini_admin_values'] = 'Mögliche php_admin_values für die php.ini. Pro Zeile eine Direktive';
+$lng['serversettings']['phpfpm_settings']['envpath'] = 'Pfade für die PATH Umgebungsvariable. Leerlassen, um keine PATH Umgebungsvariable zu setzen.';