cleanup

A. Täffner

2016-01-20 c3fd2b1a66fa79fde4e73b44228e3df734ad62bc

 install/lib/installer_base.lib.php

@@ -371,6 +371,84 @@


   }
	
   public function detect_ips(){
      global $conf;

      exec("ip addr show | awk '/global/ { print $2 }' | cut -d '/' -f 1", $output, $retval);
		
      if($retval == 0){
         if(is_array($output) && !empty($output)){
            foreach($output as $line){
               $line = trim($line);
               $ip_type = '';
               if (filter_var($line, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
                  $ip_type = 'IPv4';
               }
               if (filter_var($line, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
                  $ip_type = 'IPv6';
               }
               if($ip_type == '') continue;
               if($this->db->dbHost != $this->dbmaster->dbHost){
                  $this->dbmaster->query('INSERT INTO server_ip (
                     sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
                     sys_perm_other, server_id, client_id, ip_type, ip_address,
                     virtualhost, virtualhost_port
                  ) VALUES (
                     1,
                     1,
                     "riud",
                     "riud",
                     "",
                     ?,
                     0,
                     ?,
                     ?,
                     "y",
                     "80,443"
                  )', $conf['server_id'], $ip_type, $line);
                  $server_ip_id = $this->dbmaster->insertID();
                  $this->db->query('INSERT INTO server_ip (
                     server_php_id, sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
                     sys_perm_other, server_id, client_id, ip_type, ip_address,
                     virtualhost, virtualhost_port
                  ) VALUES (
                     ?,
                     1,
                     1,
                     "riud",
                     "riud",
                     "",
                     ?,
                     0,
                     ?,
                     ?,
                     "y",
                     "80,443"
                  )', $server_ip_id, $conf['server_id'], $ip_type, $line);
               } else {
                  $this->db->query('INSERT INTO server_ip (
                     sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
                     sys_perm_other, server_id, client_id, ip_type, ip_address,
                     virtualhost, virtualhost_port
                  ) VALUES (
                     1,
                     1,
                     "riud",
                     "riud",
                     "",
                     ?,
                     0,
                     ?,
                     ?,
                     "y",
                     "80,443"
                  )', $conf['server_id'], $ip_type, $line);
               }
            }
         }
      }
   }

   public function grant_master_database_rights($verbose = false) {
      global $conf;
@@ -1391,6 +1469,27 @@


   }
	
   //** writes bind configuration files
   public function process_bind_file($configfile, $target='/', $absolute=false) {
      global $conf;

      if ($absolute) $full_file_name = $target.$configfile;
      else $full_file_name = $conf['ispconfig_install_dir'].$target.$configfile;
		
      //* Backup exiting file
      if(is_file($full_file_name)) {
         copy($full_file_name, $config_dir.$configfile.'~');
      }
      $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);
      $content = str_replace('{mysql_server_ispconfig_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
      $content = str_replace('{ispconfig_install_dir}', $conf['ispconfig_install_dir'], $content);
      $content = str_replace('{dnssec_conffile}', $conf['ispconfig_install_dir'].'/server/scripts/dnssec-config.sh', $content);
      wf($full_file_name, $content);
   }

   public function configure_bind() {
      global $conf;
@@ -1409,6 +1508,15 @@
      chown($content, $conf['bind']['bind_user']);
      chgrp($content, $conf['bind']['bind_group']);
      chmod($content, 2770);
		
      //* Install scripts for dnssec implementation
      $this->process_bind_file('dnssec-update.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-create.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-delete.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-autoupdate.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-autopickup.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-autocreate.sh', '/server/scripts/');
      $this->process_bind_file('dnssec-config.sh', '/server/scripts/');

   }