Skip to content

Commit 8dfe490

Browse files
author
Marius Burkard
committed
- fix php fpm pool config
1 parent 0d99f51 commit 8dfe490

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

server/lib/classes/letsencrypt.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public function request_certificates($data, $server_type = 'apache') {
383383
}
384384

385385
$success = false;
386-
if(!$letsencrypt_cmd) {
386+
if($letsencrypt_cmd) {
387387
if(!isset($server_config['migration_mode']) || $server_config['migration_mode'] != 'y') {
388388
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
389389
$app->log("Let's Encrypt SSL Cert domains: $cli_domain_arg", LOGLEVEL_DEBUG);

server/lib/classes/plugin_webserver_base.inc.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2328,10 +2328,20 @@ private function php_fpm_pool_update($data, $web_config, $pool_dir, $pool_name,
23282328
$tpl->setVar('apache_version', $app->system->getapacheversion());
23292329
$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
23302330
}
2331+
if($data['new']['php_fpm_use_socket'] == 'y'){
2332+
$use_tcp = 0;
2333+
$use_socket = 1;
2334+
if(!is_dir($socket_dir)) $app->system->mkdirpath($socket_dir);
2335+
} else {
2336+
$use_tcp = 1;
2337+
$use_socket = 0;
2338+
}
2339+
$tpl->setVar('use_tcp', $use_tcp);
2340+
$tpl->setVar('use_socket', $use_socket);
2341+
$fpm_socket = $socket_dir.$pool_name.'.sock';
23312342

23322343
$tpl->setVar('php_fpm_chroot', $php_fpm_chroot);
23332344

2334-
$fpm_socket = $socket_dir.$pool_name.'.sock';
23352345
$tpl->setVar('fpm_socket', $fpm_socket);
23362346
$tpl->setVar('fpm_listen_mode', '0660');
23372347

0 commit comments

Comments
 (0)