- Added "ipv6only=on" to the IPv6 listen lines in the nginx vhost template ...

ftimme

2011-09-23 c7e47ed3dfb9116dbeb8a444ec8f2fb1a41d34f9

 install/lib/installer_base.lib.php

@@ -123,7 +123,7 @@
      if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
      if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
      if(is_installed('saslauthd')) $conf['saslauthd']['installed'] = true;
      if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
      if(is_installed('amavisd-new') || is_installed('amavisd')) $conf['amavis']['installed'] = true;
      if(is_installed('clamdscan')) $conf['clamav']['installed'] = true;
      if(is_installed('pure-ftpd') || is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['installed'] = true;
      if(is_installed('mydns') || is_installed('mydns-ng')) $conf['mydns']['installed'] = true;
@@ -134,9 +134,10 @@
      if(is_installed('nginx')) $conf['nginx']['installed'] = true;
      if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
      if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
      if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
      if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
      
      if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;
      if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;
   }

   /** Create the database for ISPConfig */
@@ -233,17 +234,18 @@
      $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
      $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
      
      $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']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
		
      if ($conf['nginx']['installed'] == true) {
         $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']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
         $tpl_ini_array['web']['server_type'] = 'nginx';
         $tpl_ini_array['global']['webserver'] = 'nginx';
      }
@@ -262,7 +264,7 @@
      $dns_server_enabled = ($conf['services']['dns'])?1:0;
      $file_server_enabled = ($conf['services']['file'])?1:0;
      $db_server_enabled = ($conf['services']['db'])?1:0;
      $vserver_server_enabled = ($conf['services']['vserver'])?1:0;
      $vserver_server_enabled = ($conf['openvz']['installed'])?1:0;
      $proxy_server_enabled = ($conf['services']['proxy'])?1:0;
      $firewall_server_enabled = ($conf['services']['firewall'])?1:0;
      
@@ -923,12 +925,7 @@
      $postconf_commands = array ();
      
      // Check for amavisd -> pure webserver with postfix for mailing without antispam
      // Check for different names
      system('which amavisd-new', $retval); // Debian, Ubuntu, ?
      if ($retval !== 0){
         system('which amavisd', $retval); // CentOS
      }
      if ($retval === 0) {
      if ($conf['amavis']['installed']) {
         $postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
         $postconf_commands[] = 'receive_override_options = no_address_mappings';
      }
@@ -1145,15 +1142,29 @@
      $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

      // copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');

		
      $content = rf('tpl/apache_ispconfig.conf.master');
      $records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");

      if(is_array($records) && count($records) > 0) {
         foreach($records as $rec) {
            $content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
            $content .= 'NameVirtualHost '.$rec['ip_address'].":443\n";
            if($rec['ip_type'] == 'IPv6') {
               $ip_address = '['.$rec['ip_address'].']';
            } else {
               $ip_address = $rec['ip_address'];
            }
            $ports = explode(',',$rec['virtualhost_port']);
            if(is_array($ports)) {
               foreach($ports as $port) {
                  $port = intval($port);
                  if($port > 0 && $port < 65536 && $ip_address != '') {
                     $content .= 'NameVirtualHost '.$ip_address.":".$port."\n";
                  }
               }
            }
         }
      }
		
      $content .= "\n";
      wf($vhost_conf_dir.'/ispconfig.conf',$content);

@@ -1908,6 +1919,11 @@
            "* * * * * ".$install_dir."/server/server.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log",
            "30 00 * * * ".$install_dir."/server/cron_daily.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log"
      );
		
      if ($conf['nginx']['installed'] == true) {
         $root_cron_jobs[] = "0 0 * * * ".$install_dir."/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
      }
		
      foreach($root_cron_jobs as $cron_job) {
         if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
            $existing_root_cron_jobs[] = $cron_job."\n";