From 464a8c61bbb3062eea1f42b4e59adb57e45ef277 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 02 Jun 2015 09:11:52 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
server/plugins-available/nginx_plugin.inc.php | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 2b5073d..24c46ba 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -902,7 +902,18 @@
$tpl = new tpl();
$tpl->newTemplate('nginx_vhost.conf.master');
+ // IPv4
+
+ //* use ip-mapping for web-mirror
+ if($data['new']['ip_address'] != '*' && $conf['mirror_server_id'] > 0) {
+ $sql = "SELECT destination_ip FROM server_ip_map WHERE server_id = ? AND source_ip = ?";
+ $newip = $app->db->queryOneRecord($sql, $conf['server_id'], $data['new']['ip_address']);
+ $data['new']['ip_address'] = $newip['destination_ip'];
+ unset($newip);
+ }
+
$vhost_data = $data['new'];
+
//unset($vhost_data['ip_address']);
$vhost_data['web_document_root'] = $data['new']['document_root'].'/' . $web_folder;
$vhost_data['web_document_root_www'] = $web_config['website_basedir'].'/'.$data['new']['domain'].'/' . $web_folder;
@@ -1097,8 +1108,19 @@
} else {
$nginx_directives = $data['new']['nginx_directives'];
}
+ if($data['new']['enable_pagespeed'] == 'y'){
+ // if PageSpeed is already enabled, don't add configuration again
+ if(stripos($nginx_directives, 'pagespeed') !== false){
+ $vhost_data['enable_pagespeed'] = false;
+ } else {
+ $vhost_data['enable_pagespeed'] = true;
+ }
+ } else {
+ $vhost_data['enable_pagespeed'] = false;
+ }
} else {
$nginx_directives = $data['new']['nginx_directives'];
+ $vhost_data['enable_pagespeed'] = false;
}
// Make sure we only have Unix linebreaks
$nginx_directives = str_replace("\r\n", "\n", $nginx_directives);
--
Gitblit v1.9.1