From 99b55bfba53aa6de380c84a036b286c951533dcb Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 28 Sep 2011 06:28:29 -0400 Subject: [PATCH] - nginx: If apps vhost is reconfigured, apps pool (PHP-FPM) is reconfigured as well. - Installer adds Apache and nginx user to ispapps group. - Installer makes sure that /var/www/apps has 755 permissions. --- server/plugins-available/apps_vhost_plugin.inc.php | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php index 5e942b2..d89a61c 100644 --- a/server/plugins-available/apps_vhost_plugin.inc.php +++ b/server/plugins-available/apps_vhost_plugin.inc.php @@ -99,6 +99,9 @@ } else { $content = str_replace('{vhost_port_listen}', '', $content); } + + file_put_contents("$vhost_conf_dir/apps.vhost", $content); + $app->services->restartServiceDelayed('httpd','restart'); } if($web_config['server_type'] == 'nginx'){ @@ -108,6 +111,9 @@ $vhost_conf_dir = $web_config['nginx_vhost_conf_dir']; $vhost_conf_enabled_dir = $web_config['nginx_vhost_conf_enabled_dir']; $apps_vhost_servername = ($web_config['apps_vhost_servername'] == '')?'_':$web_config['apps_vhost_servername']; + + $apps_vhost_user = 'ispapps'; + $apps_vhost_group = 'ispapps'; $web_config['apps_vhost_port'] = (empty($web_config['apps_vhost_port']))?8081:$web_config['apps_vhost_port']; $web_config['apps_vhost_ip'] = (empty($web_config['apps_vhost_ip']))?'_default_':$web_config['apps_vhost_ip']; @@ -129,10 +135,20 @@ $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content); //$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content); + + // PHP-FPM + // Dont just copy over the php-fpm pool template but add some custom settings + $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master"); + $fpm_content = str_replace('{fpm_pool}', 'apps', $fpm_content); + //$fpm_content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $fpm_content); + $fpm_content = str_replace('{fpm_socket}', $fpm_socket, $fpm_content); + $fpm_content = str_replace('{fpm_user}', $apps_vhost_user, $fpm_content); + $fpm_content = str_replace('{fpm_group}', $apps_vhost_group, $fpm_content); + file_put_contents($web_config['php_fpm_pool_dir'].'/apps.conf', $fpm_content); + + file_put_contents("$vhost_conf_dir/apps.vhost", $content); + $app->services->restartServiceDelayed('httpd','reload'); } - - file_put_contents("$vhost_conf_dir/apps.vhost", $content); - $app->services->restartServiceDelayed('httpd','restart'); } -- Gitblit v1.9.1