Merge branch 'feature/mysql-port' into 'master'

Marius Cramer

2015-05-19 6f6aa983d80882d10038945c10d7dedf572e0641

 install/lib/installer_base.lib.php

@@ -136,7 +136,7 @@
      if(is_installed('mysql') || is_installed('mysqld')) $conf['mysql']['installed'] = true;
      if(is_installed('postfix')) $conf['postfix']['installed'] = true;
      if(is_installed('postgrey')) $conf['postgrey']['installed'] = true;
      if(is_installed('mailman')) $conf['mailman']['installed'] = true;
      if(is_installed('mailman') || is_installed('mmsitepass')) $conf['mailman']['installed'] = true;
      if(is_installed('apache') || is_installed('apache2') || is_installed('httpd') || is_installed('httpd2')) $conf['apache']['installed'] = true;
      if(is_installed('getmail')) $conf['getmail']['installed'] = true;
      if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
@@ -154,11 +154,25 @@
      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(is_installed('metronome') && is_installed('metronomectl')) $conf['xmpp']['installed'] = true;
      if(is_installed('iptables') && is_installed('bastille-netfilter')) $conf['bastille']['installed'] = true;
      if(is_installed('metronome') && is_installed('metronomectl')) $conf['xmpp']['installed'] = true;
      if(is_installed('spamassassin')) $conf['spamassasin']['installed'] = true;
      if(is_installed('vlogger')) $conf['vlogger']['installed'] = true;
      if(is_installed('cron')) $conf['cron']['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;
   }

    public function force_configure_app($service) {
      $force = false;
        swriteln("[WARN] autodetect for $service failed");
        if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
//         swriteln("Configure $service");
            $force = true;
      } else swriteln("Skipping $service\n");
      return $force;
    }


   /** Create the database for ISPConfig */

@@ -172,7 +186,7 @@
      }

      //* Set the database name in the DB library
      $this->db->dbName = $conf['mysql']['database'];
      $this->db->setDBName($conf['mysql']['database']);

      //* Load the database dump into the database, if database contains no tables
      $db_tables = $this->db->getTables();
@@ -224,7 +238,7 @@
      $this->db->query('FLUSH PRIVILEGES;');

      //* Set the database name in the DB library
      $this->db->dbName = $conf['mysql']['database'];
      $this->db->setDBName($conf['mysql']['database']);

      $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));

@@ -278,8 +292,7 @@
      }

      $server_ini_content = array_to_ini($tpl_ini_array);
      $server_ini_content = mysql_real_escape_string($server_ini_content);

		
      $mail_server_enabled = ($conf['services']['mail'])?1:0;
      $web_server_enabled = ($conf['services']['web'])?1:0;
      $dns_server_enabled = ($conf['services']['dns'])?1:0;
@@ -872,12 +885,12 @@
      unset($parts);
      unset($out);

      if(version_compare($saslversion , '2.1.23') > 0) {
         //* Configfile for saslauthd versions 2.1.24 and newer
         $configfile = 'sasl_smtpd2.conf';
      } else {
      if(version_compare($saslversion , '2.1.23', '<=')) {
         //* Configfile for saslauthd versions up to 2.1.23
         $configfile = 'sasl_smtpd.conf';
      } else {
         //* Configfile for saslauthd versions 2.1.24 and newer
         $configfile = 'sasl_smtpd2.conf';
      }

      if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf', $conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
@@ -955,6 +968,7 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      wf($config_dir.'/'.$configfile, $content);

      chmod($config_dir.'/'.$configfile, 0660);
@@ -1039,21 +1053,21 @@
      unset($tmp);

      //* Copy dovecot configuration file
      if(version_compare($dovecot_version,2) >= 0) {
      if(version_compare($dovecot_version,1, '<=')) {   //* Dovecot 1.x
         if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master')) {
            copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
         } else {
            copy('tpl/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
         }
      } else {   //* Dovecot 2.x
         if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot2.conf.master')) {
            copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
         } else {
            copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
         }
         replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
         if(version_compare($dovecot_version,2.1) < 0) {
         if(version_compare($dovecot_version, 2.1, '<')) {
            removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
         }
      } else {
         if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master')) {
            copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
         } else {
            copy('tpl/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
         }
      }

@@ -1068,6 +1082,7 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      $content = str_replace('{server_id}', $conf['server_id'], $content);
      wf($config_dir.'/'.$configfile, $content);

@@ -1086,7 +1101,7 @@
      // amavisd user config file
      $configfile = 'amavisd_user_config';
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].'/50-user~');
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user~', 0400);
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
      $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.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);
@@ -1094,6 +1109,7 @@
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
      wf($conf['amavis']['config_dir'].'/conf.d/50-user', $content);
      chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);

      // TODO: chmod and chown on the config file

@@ -1245,6 +1261,7 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      $content = str_replace('{server_id}', $conf['server_id'], $content);
      wf($conf['mydns']['config_dir'].'/'.$configfile, $content);
      chmod($conf['mydns']['config_dir'].'/'.$configfile, 0600);
@@ -1288,6 +1305,7 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{powerdns_database}', $conf['powerdns']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      wf($conf['powerdns']['config_dir'].'/'.$configfile, $content);
      chmod($conf['powerdns']['config_dir'].'/'.$configfile, 0600);
      chown($conf['powerdns']['config_dir'].'/'.$configfile, 'root');
@@ -1307,11 +1325,12 @@

      //* Create the slave subdirectory
      $content .= 'slave';
      if(!@is_dir($content)) mkdir($content, 0770, true);
      if(!@is_dir($content)) mkdir($content, 2770, true);

      //* Chown the slave subdirectory to $conf['bind']['bind_user']
      chown($content, $conf['bind']['bind_user']);
      chgrp($content, $conf['bind']['bind_group']);
      chmod($content, 2770);

   }

@@ -1952,11 +1971,13 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);

      $content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
      $content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
      $content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
      $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
      $content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);

      $content = str_replace('{server_id}', $conf['server_id'], $content);
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -1977,11 +1998,13 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);

      $content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
      $content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
      $content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
      $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
      $content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);

      $content = str_replace('{server_id}', $conf['server_id'], $content);
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -2187,6 +2210,11 @@
      $command = "chmod +x $install_dir/server/scripts/*.sh";
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      if ($this->install_ispconfig_interface == true && isset($conf['interface_password']) && $conf['interface_password']!='admin') {
         $sql = "UPDATE sys_user SET passwort = md5(?) WHERE username = 'admin';";
         $this->db->query($sql, $conf['interface_password']);
      }

      if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
         //* Copy the ISPConfig vhost for the controlpanel
         $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
@@ -2362,6 +2390,11 @@
      // Add symlink for patch tool
      if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
      
      // Change mode of a few files from amavisd
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
      if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
   }

   public function configure_dbserver() {
@@ -2489,7 +2522,11 @@
      if(is_file('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/db_firebird.inc.php');
      if(is_file('/usr/local/ispconfig/interface/lib/classes/form.inc.php')) unlink('/usr/local/ispconfig/interface/lib/classes/form.inc.php');
      
		
      // Change mode of a few files from amavisd
      if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
      if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
      if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
      
   }

@@ -2621,6 +2658,7 @@
      $tContents = str_replace('{mysql_server_database}', $conf["mysql"]["database"], $tContents);
      $tContents = str_replace('{mysql_server_ip}', $conf["mysql"]["ip"], $tContents);
      $tContents = str_replace('{mysql_server_host}', $conf['mysql']['host'], $tContents);
      $tContents = str_replace('{mysql_server_port}', $conf['mysql']['port'], $tContents);
      $tContents = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $tContents);

      return $tContents;