diff --git a/lib/classes/api/commands/class.PhpSettings.php b/lib/classes/api/commands/class.PhpSettings.php index fa445512..03aeb3b2 100644 --- a/lib/classes/api/commands/class.PhpSettings.php +++ b/lib/classes/api/commands/class.PhpSettings.php @@ -193,6 +193,8 @@ class PhpSettings extends ApiCommand implements ResourceEntity $fpm_config_id = 1; } elseif (Settings::Get('phpfpm.enabled') == 1) { $fpm_config_id = intval($this->getParam('fpmconfig')); + } else { + $fpm_config_id = 1; } // parameters diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 31f16d37..045b2cc3 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -135,4 +135,19 @@ $admin_userdata = Database::pexecute_first($sel_stmt); $admin_userdata['adminsession'] = 1; Settings::Set('panel.standardlanguage', 'English', true); +Settings::Set('panel.adminmail', 'admin@dev.froxlor.org', true); +Settings::Set('panel.allow_domain_change_admin', '1', true); +Settings::Set('panel.allow_domain_change_customer', '1', true); Settings::Set('system.lastguid', '10000', true); +Settings::Set('system.ipaddress', '82.149.225.46', true); +Settings::Set('system.documentroot_use_default_value', '1', true); +Settings::Set('system.hostname', 'dev.froxlor.org', true); +Settings::Set('system.nameservers', 'dev.froxlor.org', true); +Settings::Set('system.mysql_access_host', 'localhost,127.0.0.1,2a01:440:1:12:82:149:225:46,82.149.225.46', true); +Settings::Set('system.use_ssl', '1', true); +Settings::Set('system.froxlordirectlyviahostname', '1', true); +Settings::Set('system.dns_createhostnameentry', '1', true); +Settings::Set('system.dnsenabled', '1', true); +Settings::Set('system.dns_server', 'pdns', true); +Settings::Set('phpfpm.enabled', '1', true); +Settings::Set('phpfpm.enabled_ownvhost', '1', true);