Create symlink for dovecot-sql.conf on Centos in /etc

Till Brehm

2014-05-02 85f6fb3a343bc9287c5ea0488eb97c850ad58eab

 install/dist/lib/opensuse.lib.php

@@ -29,7 +29,23 @@
*/

class installer_dist extends installer_base {

	
   public function __construct() {
      //** check apache modules */
      $mods = getapachemodules();
      if(in_array('authz_compat', $mods, true)) {
         swriteln($inst->lng('    WARNING! You are using mod_authz_compat.'));
         swriteln($inst->lng('    Please make sure that your apache config uses the new auth syntax:'));
         swriteln($inst->lng('    <Directory />'));
         swriteln($inst->lng('    Options None'));
         swriteln($inst->lng('    AllowOverride None'));
         swriteln($inst->lng('    Require all denied'));
         swriteln($inst->lng('    </Directory>'."\n"));
			
         swriteln($inst->lng('    If it uses the old syntax (deny from all) ISPConfig would fail to work.'));
      }
   }
	
   public function configure_mailman($status = 'insert') {
      global $conf;

@@ -660,10 +676,12 @@
      $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
      $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

      //copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
      $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig.conf.master', 'tpl/apache_ispconfig.conf.master');
      $tpl = new tpl('apache_ispconfig.conf.master');
      $tpl->setVar('apache_version',getapacheversion());
		
      $records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");

      $ip_addresses = array();
		
      if(is_array($records) && count($records) > 0) {
         foreach($records as $rec) {
            if($rec['ip_type'] == 'IPv6') {
@@ -676,15 +694,17 @@
               foreach($ports as $port) {
                  $port = intval($port);
                  if($port > 0 && $port < 65536 && $ip_address != '') {
                     $content .= 'NameVirtualHost '.$ip_address.":".$port."\n";
                     $ip_addresses[] = array('ip_address' => $ip_address, 'port' => $port);
                  }
               }
            }
         }
      }

      $content .= "\n";
      wf($vhost_conf_dir.'/ispconfig.conf', $content);
		
      if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);
		
      wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());
      unset($tpl);

      if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
         exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
@@ -1074,6 +1094,9 @@
            $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
         // add nobody user to www group, as the default php-fpm pool from opensuse runs as nobody
         $command = 'usermod -a -G www nobody';
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      }

      //* Make the shell scripts executable
@@ -1089,31 +1112,32 @@


         // Dont just copy over the virtualhost template but add some custom settings

         $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig.vhost.master', "tpl/apache_ispconfig.vhost.master");
         $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
         $tpl = new tpl('apache_ispconfig.vhost.master');
         $tpl->setVar('vhost_port',$conf['apache']['vhost_port']);

         // 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);
            $tpl->setVar('vhost_port_listen','#');
         } else {
            $content = str_replace('{vhost_port_listen}', '', $content);
            $tpl->setVar('vhost_port_listen','');
         }

         if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
            $content = str_replace('{ssl_comment}', '', $content);
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
            $tpl->setVar('ssl_comment','');
         } else {
            $content = str_replace('{ssl_comment}', '#', $content);
            $tpl->setVar('ssl_comment','#');
         }
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
            $content = str_replace('{ssl_bundle_comment}', '', $content);
            $tpl->setVar('ssl_bundle_comment','');
         } else {
            $content = str_replace('{ssl_bundle_comment}', '#', $content);
            $tpl->setVar('ssl_bundle_comment','#');
         }
			
         $tpl->setVar('apache_version',getapacheversion());

         $content = $tpl->grab();
         $content = str_replace('/var/www/', '/srv/www/', $content);

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

         //if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
         $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');