From dba68fcdf2d3e25ad1f3301fcb128edfb3da745b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 22 Sep 2011 08:14:04 -0400
Subject: [PATCH] Bugfixes in installer and apache plugin.
---
server/plugins-available/apps_vhost_plugin.inc.php | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index b16778b..47202a8 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -70,39 +70,63 @@
// The purpose of this plugin is to rewrite the main.cf file
function update($event_name,$data) {
global $app, $conf;
-
- if( $data['old']['apps_vhost_ip'] != $data['new']['apps_vhost_ip'] or
- $data['old']['apps_vhost_port'] != $data['new']['apps_vhost_port'] or
- $data['old']['apps_vhost_servername'] != $data['new']['apps_vhost_servername'] ) {
-
+
// get the config
$app->uses("getconf");
$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
- // Dont just copy over the virtualhost template but add some custom settings
- $content = rf("conf/apache_apps.vhost.master");
+ if($web_config['server_type'] == 'apache'){
+ // Dont just copy over the virtualhost template but add some custom settings
+ $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master");
- $vhost_conf_dir = $web_config['vhost_conf_dir'];
- $vhost_conf_enabled_dir = $web_config['vhost_conf_enabled_dir'];
- $apps_vhost_servername = ($web_config['apps_vhost_servername'] == '')?'':'ServerName '.$web_config['apps_vhost_servername'];
+ $vhost_conf_dir = $web_config['vhost_conf_dir'];
+ $vhost_conf_enabled_dir = $web_config['vhost_conf_enabled_dir'];
+ $apps_vhost_servername = ($web_config['apps_vhost_servername'] == '')?'':'ServerName '.$web_config['apps_vhost_servername'];
- $content = str_replace('{apps_vhost_ip}', $web_config['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);
+ $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'];
+
+ $content = str_replace('{apps_vhost_ip}', $web_config['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('{apps_vhost_basedir}', $web_config['website_basedir'], $content);
- // 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) {
- $content = str_replace('{vhost_port_listen}', '#', $content);
- } else {
- $content = str_replace('{vhost_port_listen}', '', $content);
+ // 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) {
+ $content = str_replace('{vhost_port_listen}', '#', $content);
+ } else {
+ $content = str_replace('{vhost_port_listen}', '', $content);
+ }
}
- wf("$vhost_conf_dir/apps.vhost", $content);
+ if($web_config['server_type'] == 'nginx'){
+ // Dont just copy over the virtualhost template but add some custom settings
+ $content = file_get_contents($conf["rootpath"]."/conf/nginx_apps.vhost.master");
+
+ $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'];
+
+ $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'];
+
+ if($web_config['apps_vhost_ip'] == '_default_'){
+ $apps_vhost_ip = '';
+ } else {
+ $apps_vhost_ip = $web_config['apps_vhost_ip'].':';
+ }
+
+ $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);
}
-
+ file_put_contents("$vhost_conf_dir/apps.vhost", $content);
+ $app->services->restartServiceDelayed('httpd','restart');
}
--
Gitblit v1.9.1