Fixed typo in error message.

tbrehm

2013-05-27 15e982543e1d25832ad5f47b07f1564b54d3fd7a

 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;
      }
      
   }
   
@@ -77,7 +81,12 @@
            
      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");
         if(file_exists($conf["rootpath"]."/conf-custom/apache_apps.vhost.master")) {
            $content = file_get_contents($conf["rootpath"]."/conf-custom/apache_apps.vhost.master");
         } else {
            $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'];
@@ -94,7 +103,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);
@@ -106,7 +115,11 @@
      
      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'];
@@ -137,10 +150,24 @@
         //$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
         $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);