From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/apps_vhost_plugin.inc.php | 129 +++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 53 deletions(-)
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index f954e45..320f3d0 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -29,111 +29,129 @@
*/
class apps_vhost_plugin {
-
+
var $plugin_name = 'apps_vhost_plugin';
var $class_name = 'apps_vhost_plugin';
-
-
+
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
global $conf;
-
+
if($conf['services']['web'] == true) {
return true;
} else {
return false;
}
-
+
}
-
+
/*
This function is called when the plugin is loaded
*/
-
+
function onLoad() {
global $app;
-
+
/*
Register for the events
*/
-
- $app->plugins->registerEvent('server_insert','apps_vhost_plugin','insert');
- $app->plugins->registerEvent('server_update','apps_vhost_plugin','update');
-
-
+
+ $app->plugins->registerEvent('server_insert', 'apps_vhost_plugin', 'insert');
+ $app->plugins->registerEvent('server_update', 'apps_vhost_plugin', 'update');
+
+
}
-
- function insert($event_name,$data) {
+
+ function insert($event_name, $data) {
global $app, $conf;
-
- $this->update($event_name,$data);
-
+
+ $this->update($event_name, $data);
+
}
-
+
// The purpose of this plugin is to rewrite the main.cf file
- function update($event_name,$data) {
+ function update($event_name, $data) {
global $app, $conf;
-
+
// get the config
$app->uses("getconf");
$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
-
+
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");
-
+ $app->load('tpl');
+
+ $tpl = new tpl();
+ $tpl->newTemplate('apache_apps.vhost.master');
+
+ $tpl->setVar('apache_version', $app->system->getapacheversion());
+
$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'];
-
+
$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'];
-
+
+ $tpl->setVar('apps_vhost_ip', $web_config['apps_vhost_ip']);
+ $tpl->setVar('apps_vhost_port', $web_config['apps_vhost_port']);
+ $tpl->setVar('apps_vhost_dir', $web_config['website_basedir'].'/apps');
+ $tpl->setVar('apps_vhost_servername', $apps_vhost_servername);
+ $tpl->setVar('apps_vhost_basedir', $web_config['website_basedir']);
+
+ $vhost_port_listen = '';
+ // comment out the listen directive if port is 80 or 443
+ if($web_config['apps_vhost_port'] == 80 or $web_config['apps_vhost_port'] == 443) {
+ $vhost_port_listen = '#';
+ }
+ $tpl->setVar('vhost_port_listen', $vhost_port_listen);
+
+ $content = $tpl->grab();
+
+ /* for backwards compatibility we replace the old syntax by hand now */
$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_port'] == 80 or $web_config['apps_vhost_port'] == 443) {
- $content = str_replace('{vhost_port_listen}', '#', $content);
- } else {
- $content = str_replace('{vhost_port_listen}', '', $content);
- }
-
- file_put_contents("$vhost_conf_dir/apps.vhost", $content);
- $app->services->restartServiceDelayed('httpd','restart');
+ $content = str_replace('{vhost_port_listen}', $vhost_port_listen, $content);
+ /* end of backwards compatibility section */
+
+ $app->system->file_put_contents("$vhost_conf_dir/apps.vhost", $content);
+ $app->services->restartServiceDelayed('httpd', 'restart');
}
-
+
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");
-
+ if(file_exists($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master")) {
+ $content = file_get_contents($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master");
+ } else {
+ $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'];
-
+
$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'];
-
+
if($web_config['apps_vhost_ip'] == '_default_'){
$apps_vhost_ip = '';
} 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(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);
@@ -150,25 +168,30 @@
}
$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
- $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master");
+ if(file_exists($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master")) {
+ $fpm_content = file_get_contents($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master");
+ } else {
+ $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');
+ $app->services->restartServiceDelayed('httpd', 'reload');
}
}
-
+
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1