- added example for REST api

Marius Burkard

2016-05-23 9376d70f0ccba49ead95ef47f0ecba568ea2d6e1

 install/install.php

@@ -140,6 +140,8 @@
//****************************************************************************************************
$inst = new installer();
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
$retval=shell_exec("which which");
if (empty($retval)) die ("ISPConfig requieres which \n");

swriteln($inst->lng('    Following will be a few questions for primary configuration so be careful.'));
swriteln($inst->lng('    Default values are in [brackets] and can be accepted with <ENTER>.'));
@@ -208,7 +210,7 @@
   }

   //* Initialize the MySQL server connection
   if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
   if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, '', (int)$tmp_mysql_server_port)) {
      $conf['mysql']['host'] = $tmp_mysql_server_host;
      $conf['mysql']['port'] = $tmp_mysql_server_port;
      $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -217,7 +219,7 @@
      $conf['mysql']['charset'] = $tmp_mysql_server_charset;
      $finished = true;
   } else {
      swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error());
      swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error());
   }
} while ($finished == false);
unset($finished);
@@ -328,22 +330,29 @@
   } else swriteln('[ERROR] Postfix not installed - skipping Mail');

   //* Check for DNS
   if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
      $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
//   if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
   if(!$conf['bind']['installed'] && !$conf['mydns']['installed']) {
//      $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
      $conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
      $conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
   }
   //* Configure PowerDNS
/*
   if($conf['powerdns']['installed']) {
      swriteln('Configuring PowerDNS');
      $inst->configure_powerdns();
      $conf['services']['dns'] = true;
   }
*/

   //* Configure Bind
   if($conf['bind']['installed']) {
      swriteln('Configuring BIND');
      $inst->configure_bind();
      $conf['services']['dns'] = true;
      if(!is_installed('haveged')) {
         swriteln("[INFO] haveged not detected - DNSSEC can fail");
      }
   }
   //* Configure MyDNS
   if($conf['mydns']['installed']) {
@@ -445,6 +454,7 @@
      swriteln('Configuring Bastille Firewall');
      $inst->configure_bastille_firewall();
      $conf['services']['firewall'] = true;
      $conf['bastille']['installed'] = true;
   }

   //* Configure Fail2ban
@@ -553,7 +563,7 @@
         $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

         //* Initialize the MySQL server connection
         if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
         if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
            $conf['mysql']['master_host'] = $tmp_mysql_server_host;
            $conf['mysql']['master_port'] = $tmp_mysql_server_port;
            $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -561,7 +571,7 @@
            $conf['mysql']['master_database'] = $tmp_mysql_server_database;
            $finished = true;
         } else {
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
         }
      } while ($finished == false);
      unset($finished);
@@ -702,9 +712,6 @@
      $inst->configure_pureftpd();
   }
   
   swriteln('Detect IP addresses');
   $inst->detect_ips();

   //** Configure DNS
   if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') {
      $conf['services']['dns'] = true;
@@ -726,6 +733,9 @@
         swriteln('Configuring BIND');
         $inst->configure_bind();
         $conf['services']['dns'] = true;
         if(!is_installed('haveged')) {
            swriteln("[INFO] haveged not detected - DNSSEC can fail");
         }
      }
      //* Configure MyDNS
      if($conf['mydns']['installed']) {