Fixed: FS#474 - serial not updated for domain after changes

tbrehm

2010-06-02 0c34be59d2d1eba22e7346aa3a9453d020700e4a

Fixed: FS#474 - serial not updated for domain after changes

 server/conf/bind_named.conf.local.master

@@ -3,7 +3,7 @@
<tmpl_if name='zone'>
zone "<tmpl_var name='zone'>" {
        type master;
        file "<tmpl_var name='zonefile_path'>";
<tmpl_var name='options'>        file "<tmpl_var name='zonefile_path'>";
};
</tmpl_if>
</tmpl_loop>

 server/plugins-available/bind_plugin.inc.php

@@ -99,6 +99,7 @@
        
            $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'");
            $tpl->setLoop('zones',$records);
			
        
            $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
            $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
@@ -106,6 +107,7 @@
            exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename);
            unset($tpl);
            unset($records);
            unset($records_out);
            unset($zone);
        }
        
@@ -136,9 +138,9 @@
        $this->write_named_conf($data,$dns_config);
        
        //* Delete the domain file
        $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
        if(is_file($filename)) unset($filename);
        $app->log("Deleting BIND domain file: ".$filename,LOGLEVEL_DEBUG);
        $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
        if(is_file($zone_file_name)) unlink($zone_file_name);
        $app->log("Deleting BIND domain file: ".$zone_file_name,LOGLEVEL_DEBUG);
        
        //* Reload bind nameserver
        $app->services->restartServiceDelayed('bind','reload');
@@ -186,11 +188,18 @@
    function write_named_conf($data, $dns_config) {
        global $app, $conf;
        
        $tmps = $app->db->queryAllRecords("SELECT origin FROM dns_soa WHERE active = 'Y'");
        $tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify FROM dns_soa WHERE active = 'Y'");
        $zones = array();

        foreach($tmps as $tmp) {
			
            $options = '';
            if(trim($tmp['xfer']) != '') $options .= '        allow-transfer {'.str_replace(',',';',$tmp['xfer']).";};\n";
            if(trim($tmp['also_notify']) != '') $options .= '        also-notify {'.str_replace(',',';',$tmp['also_notify']).";};\n";
			
            $zones[] = array(    'zone' => substr($tmp['origin'],0,-1),
                                'zonefile_path' => $dns_config['bind_zonefiles_dir'].'/pri.'.substr($tmp['origin'],0,-1)
                                'zonefile_path' => $dns_config['bind_zonefiles_dir'].'/pri.'.substr($tmp['origin'],0,-1),
                                'options' => $options
                            );
        }