From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
server/plugins-available/apps_vhost_plugin.inc.php | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index 47202a8..538c46c 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -39,7 +39,11 @@
function onInstall() {
global $conf;
- return true;
+ if($conf['services']['web'] == true) {
+ return true;
+ } else {
+ return false;
+ }
}
@@ -99,6 +103,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 +115,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'];
@@ -117,16 +127,34 @@
} else {
$apps_vhost_ip = $web_config['apps_vhost_ip'].':';
}
+
+ $socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
+ if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
+ if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
+ $fpm_socket = $socket_dir.'apps.sock';
+ $cgi_socket = escapeshellcmd($web_config['nginx_cgi_socket']);
$content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content);
$content = str_replace('{apps_vhost_port}', $web_config['apps_vhost_port'], $content);
$content = str_replace('{apps_vhost_dir}', $web_config['website_basedir'].'/apps', $content);
$content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
- $content = str_replace('{fpm_port}', $web_config['php_fpm_start_port'], $content);
+ //$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content);
+ $content = str_replace('{fpm_socket}', $fpm_socket, $content);
+ $content = str_replace('{cgi_socket}', $cgi_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