- Added nginx support to the installer.

ftimme

2011-09-19 4ffb51e51f89a45256836fb55ad1c29f5e06beb2

 install/lib/installer_base.lib.php

@@ -234,8 +234,17 @@
      $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
      
      if ($conf['nginx']['installed'] == true) {
         $tpl_ini_array['nginx']['vhost_conf_dir'] = $conf['nginx']['vhost_conf_dir'];
         $tpl_ini_array['nginx']['vhost_conf_enabled_dir'] = $conf['nginx']['vhost_conf_enabled_dir'];
         $tpl_ini_array['web']['nginx_vhost_conf_dir'] = $conf['nginx']['vhost_conf_dir'];
         $tpl_ini_array['web']['nginx_vhost_conf_enabled_dir'] = $conf['nginx']['vhost_conf_enabled_dir'];
         $tpl_ini_array['web']['nginx_user'] = $conf['nginx']['user'];
         $tpl_ini_array['web']['nginx_group'] = $conf['nginx']['group'];
         $tpl_ini_array['web']['nginx_cgi_socket'] = $conf['nginx']['cgi_socket'];
         $tpl_ini_array['web']['php_fpm_init_script'] = $conf['nginx']['php_fpm_init_script'];
         $tpl_ini_array['web']['php_fpm_ini_path'] = $conf['nginx']['php_fpm_ini_path'];
         $tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];
         $tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];
         $tpl_ini_array['web']['server_type'] = 'nginx';
         $tpl_ini_array['global']['webserver'] = 'nginx';
      }
      
      if (array_key_exists('awstats', $conf)) {
@@ -1109,6 +1118,7 @@
   public function configure_apache() {
      global $conf;

      if($conf['apache']['installed'] == false) return;
      //* Create the logging directory for the vhost logfiles
      if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);

@@ -1174,9 +1184,36 @@

   }
   
   public function configure_nginx()
   {
   public function configure_nginx(){
      global $conf;
		
      if($conf['nginx']['installed'] == false) return;
      //* Create the logging directory for the vhost logfiles
      if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);

      //* make sure that webalizer finds its config file when it is directly in /etc
      if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
         mkdir('/etc/webalizer');
         symlink('/etc/webalizer.conf','/etc/webalizer/webalizer.conf');
      }

      if(is_file('/etc/webalizer/webalizer.conf')) {
         // Change webalizer mode to incremental
         replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
         replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental     yes',0,0);
         replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName     webalizer.hist',0,0);
      }
		
      // Check the awsatst script
      if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
      if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
      if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local','LogFormat=4','LogFormat=1',0,1);
		
      //* add a sshusers group
      $command = 'groupadd sshusers';
      if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
		
      /*
      $row = $this->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$conf["server_id"]."");
      $ip_address = gethostbyname($row["server_name"]);
      $server_name = $row["server_name"];
@@ -1204,6 +1241,7 @@
        exec('chown www-data:www-data /var/cache/nginx/cache');
        mkdir('/var/cache/nginx/temp');
        exec('chown www-data:www-data /var/cache/nginx/temp');
      */
   }
   
   public function configure_squid()
@@ -1325,65 +1363,115 @@
      global $conf;

      //* Create the ispconfig apps vhost user and group
      if($conf['apache']['installed'] == true){
         $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
         $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
         $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');

      $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
      $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
      $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
         $command = 'groupadd '.$apps_vhost_user;
         if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      $command = 'groupadd '.$apps_vhost_user;
      if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      $command = 'useradd -g '.$apps_vhost_group.' -d '.$install_dir.' '.$apps_vhost_group;
      if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         $command = 'useradd -g '.$apps_vhost_group.' -d '.$install_dir.' '.$apps_vhost_group;
         if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


      $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
      chown($install_dir, $apps_vhost_user);
      chgrp($install_dir, $apps_vhost_group);
         if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);

      //* Copy the apps vhost file
      $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
      $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
      $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];
         //* Copy the apps vhost file
         $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
         $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];

      // Dont just copy over the virtualhost template but add some custom settings
      $content = rf('tpl/apache_apps.vhost.master');
         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/apache_apps.vhost.master');

      $content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content);
      $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
      $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
      $content = str_replace('{website_basedir}', $conf['web']['website_basedir'], $content);
      $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
         $content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content);
         $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
         $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
         $content = str_replace('{website_basedir}', $conf['web']['website_basedir'], $content);
         $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);


      // comment out the listen directive if port is 80 or 443
      if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['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($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['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);
         wf($vhost_conf_dir.'/apps.vhost', $content);

      //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
      //* and create the symlink
      if($this->install_ispconfig_interface == true) {
         if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
         if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
            symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
         //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
         //* and create the symlink
         if($this->install_ispconfig_interface == true) {
            if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
            if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
               symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
            }
         }
         if(!is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter')) {
            mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
            copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
            exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
            exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');

         }
      }
      if(!is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter')) {
         mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
         copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
         exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
         exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
      if($conf['nginx']['installed'] == true){
         $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
         $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
         $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');

         $command = 'groupadd '.$apps_vhost_user;
         if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

         $command = 'useradd -g '.$apps_vhost_group.' -d '.$install_dir.' '.$apps_vhost_group;
         if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


         $command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

         if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);

         //* Copy the apps vhost file
         $vhost_conf_dir = $conf['nginx']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['nginx']['vhost_conf_enabled_dir'];
         $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'_':$conf['web']['apps_vhost_servername'];

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/nginx_apps.vhost.master');
			
         if($conf['web']['apps_vhost_ip'] == '_default_'){
            $apps_vhost_ip = '';
         } else {
            $apps_vhost_ip = $conf['web']['apps_vhost_ip'].':';
         }

         $content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content);
         $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
         $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
         $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
         $content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);

         wf($vhost_conf_dir.'/apps.vhost', $content);

         //copy('tpl/nginx_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
         //* and create the symlink
         if($this->install_ispconfig_interface == true) {
            if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
            if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
               symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
            }
         }
      }

   }
   
   public function make_ispconfig_ssl_cert() {
@@ -1522,6 +1610,8 @@
      if (is_dir($dir)) {
         if ($dh = opendir($dir)) {
            while (($file = readdir($dh)) !== false) {
               if($conf['apache']['installed'] == true && $file == 'nginx_plugin.inc.php') continue;
               if($conf['nginx']['installed'] == true && $file == 'apache2_plugin.inc.php') continue;
               if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
                  include_once($install_dir.'/server/plugins-available/'.$file);
                  $plugin_name = substr($file,0,-8);
@@ -1624,45 +1714,90 @@
      $command = "chmod +x $install_dir/server/scripts/*.sh";
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      //* Copy the ISPConfig vhost for the controlpanel
      $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
      $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
      if($conf['apache']['installed'] == true){
         //* Copy the ISPConfig vhost for the controlpanel
         $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/apache_ispconfig.vhost.master');
         $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);

      // Dont just copy over the virtualhost template but add some custom settings
      $content = rf('tpl/apache_ispconfig.vhost.master');
      $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);

      // comment out the listen directive if port is 80 or 443
      if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 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($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
            $content = str_replace('{vhost_port_listen}', '#', $content);
         } else {
            $content = str_replace('{vhost_port_listen}', '', $content);
         }
      
      if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
         $content = str_replace('{ssl_comment}', '', $content);
      } else {
         $content = str_replace('{ssl_comment}', '#', $content);
      }
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
            $content = str_replace('{ssl_comment}', '', $content);
         } else {
            $content = str_replace('{ssl_comment}', '#', $content);
         }

      wf($vhost_conf_dir.'/ispconfig.vhost', $content);
         wf($vhost_conf_dir.'/ispconfig.vhost', $content);

      //copy('tpl/apache_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
      //* and create the symlink
      if($this->install_ispconfig_interface == true && $this->is_update == false) {
         if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
         if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
            symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
         //copy('tpl/apache_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
         //* and create the symlink
         if($this->install_ispconfig_interface == true && $this->is_update == false) {
            if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
            if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
               symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
            }
         }
         if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
            mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
            copy('tpl/apache_ispconfig_fcgi_starter.master','/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
            exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
            symlink($install_dir.'/interface/web','/var/www/ispconfig');
            exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');

         }
      }
      if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
         mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
         copy('tpl/apache_ispconfig_fcgi_starter.master','/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
         exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
         symlink($install_dir.'/interface/web','/var/www/ispconfig');
         exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
		
      if($conf['nginx']['installed'] == true){
         //* Copy the ISPConfig vhost for the controlpanel
         $vhost_conf_dir = $conf['nginx']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['nginx']['vhost_conf_enabled_dir'];

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/nginx_ispconfig.vhost.master');
         $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
		
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
            $content = str_replace('{ssl_on}', ' ssl', $content);
            $content = str_replace('{ssl_comment}', '', $content);
            $content = str_replace('{fastcgi_ssl}', 'on', $content);
         } else {
            $content = str_replace('{ssl_on}', '', $content);
            $content = str_replace('{ssl_comment}', '#', $content);
            $content = str_replace('{fastcgi_ssl}', 'off', $content);
         }
			
         $content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);

         wf($vhost_conf_dir.'/ispconfig.vhost', $content);
			
         unset($content);
			
         // PHP-FPM
         // Dont just copy over the php-fpm pool template but add some custom settings
         $content = rf('tpl/php_fpm_pool.conf.master');
         $content = str_replace('{fpm_pool}', 'ispconfig', $content);
         $content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         $content = str_replace('{fpm_user}', 'ispconfig', $content);
         $content = str_replace('{fpm_group}', 'ispconfig', $content);
         wf($conf['nginx']['php_fpm_pool_dir'].'/ispconfig.conf', $content);

         //copy('tpl/nginx_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
         //* and create the symlink
         if($this->install_ispconfig_interface == true && $this->is_update == false) {
            if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
            if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
               symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
            }
         }
      }

      //* Install the update script