Merge branch 'dns-dnssec' into 'stable-3.1'

Marius Burkard

2016-01-29 b8f4caccb73052b9d7488b592ed4854958a4dc76

 install/lib/installer_base.lib.php

@@ -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;
@@ -1487,7 +1508,9 @@
      chown($content, $conf['bind']['bind_user']);
      chgrp($content, $conf['bind']['bind_group']);
      chmod($content, 02770);

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