Marius Cramer
2013-10-14 d9bcf68e395d6156645a7974b1a992aa6e6c00aa
install/dist/lib/debian60.lib.php
@@ -76,15 +76,36 @@
      if(is_file($config_dir.'/'.$configfile)){
         copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
      }
      copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
      //* Get the dovecot version
      exec('dovecot --version',$tmp);
      $parts = explode('.',trim($tmp[0]));
      $dovecot_version = $parts[0];
      unset($tmp);
      unset($parts);
      //* Copy dovecot configuration file
      if($dovecot_version == 2) {
            if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master')) {
                copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile);
            } else {
                copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
            }
      } else {
            if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
                copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master', $config_dir.'/'.$configfile);
            } else {
                copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
            }
      }
      
      //* dovecot-sql.conf
      $configfile = 'dovecot-sql.conf';
      if(is_file($config_dir.'/'.$configfile)){
         copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
         chmod($config_dir.'/'.$configfile.'~', 0400);
      }
      chmod($config_dir.'/'.$configfile.'~', 0400);
      $content = rf('tpl/debian6_dovecot-sql.conf.master');
      $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot-sql.conf.master', 'tpl/debian6_dovecot-sql.conf.master');
      $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
      $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
@@ -113,4 +134,4 @@
    }
}
?>
?>