fixed reconfigure services during update

Florian Schaal

2016-01-29 cffef25940ced035a5bf9a4537f1ec31ae31f4b8

 install/lib/installer_base.lib.php

@@ -400,32 +400,32 @@
                     "riud",
                     "riud",
                     "",
                     ' . $conf['server_id'] . ',
                     ?,
                     0,
                     "'.$ip_type.'",
                     "'.$line.'",
                     ?,
                     ?,
                     "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 (
                     '.$server_ip_id.',
                     ?,
                     1,
                     1,
                     "riud",
                     "riud",
                     "",
                     ' . $conf['server_id'] . ',
                     ?,
                     0,
                     "'.$ip_type.'",
                     "'.$line.'",
                     ?,
                     ?,
                     "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,
@@ -437,13 +437,13 @@
                     "riud",
                     "riud",
                     "",
                     ' . $conf['server_id'] . ',
                     ?,
                     0,
                     "'.$ip_type.'",
                     "'.$line.'",
                     ?,
                     ?,
                     "y",
                     "80,443"
                  )');
                  )', $conf['server_id'], $ip_type, $line);
               }
            }
         }
@@ -1469,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;
@@ -1481,13 +1502,15 @@

      //* Create the slave subdirectory
      $content .= 'slave';
      if(!@is_dir($content)) mkdir($content, 2770, true);
      if(!@is_dir($content)) mkdir($content, 02770, 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);

      chmod($content, 02770);
		
      //* Install scripts for dnssec implementation
      $this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
   }


@@ -2822,4 +2845,4 @@

}

?>
?>