From c9a8ffcfe048d2689cfc24893fa89287d43e862c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 07 Jan 2013 04:47:04 -0500
Subject: [PATCH] Updated Czech language files.
---
server/plugins-available/apps_vhost_plugin.inc.php | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index f9fe65b..f954e45 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;
+ }
}
@@ -94,7 +98,7 @@
// comment out the listen directive if port is 80 or 443
- if($web_config['apps_vhost_ip'] == 80 or $web_config['apps_vhost_ip'] == 443) {
+ if($web_config['apps_vhost_port'] == 80 or $web_config['apps_vhost_port'] == 443) {
$content = str_replace('{vhost_port_listen}', '#', $content);
} else {
$content = str_replace('{vhost_port_listen}', '', $content);
@@ -137,6 +141,15 @@
//$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);
+ if(file_exists('/var/run/php5-fpm.sock')){
+ $use_tcp = '#';
+ $use_socket = '';
+ } else {
+ $use_tcp = '';
+ $use_socket = '#';
+ }
+ $content = str_replace('{use_tcp}', $use_tcp, $content);
+ $content = str_replace('{use_socket}', $use_socket, $content);
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
--
Gitblit v1.9.1