tbrehm
2009-10-30 fc70a2c6f607458d2ce330808b16be58ace2989f
Added debugging to bind plugin and fixed a few bugs.
3 files modified
39 ■■■■■ changed files
server/conf/bind_named.conf.local.master 4 ●●●● patch | view | raw | blame | history
server/conf/bind_pri.domain.master 5 ●●●● patch | view | raw | blame | history
server/plugins-available/bind_plugin.inc.php 30 ●●●● patch | view | raw | blame | history
server/conf/bind_named.conf.local.master
@@ -1,7 +1,7 @@
<tmpl_loop name='zones'>
zone "<tmpl_var name='origin'>" {
zone "<tmpl_var name='zone'>" {
        type master;
        file "pri.<tmpl_var name='origin'>";
        file "<tmpl_var name='zonefile_path'>";
};
</tmpl_loop>
server/conf/bind_pri.domain.master
@@ -1,5 +1,5 @@
$TTL        {tmpl_var name='ttl'}
@       IN      SOA     {tmpl_var name='ns'} {tmpl_var name='mbox'}. (
@       IN      SOA     {tmpl_var name='ns'} {tmpl_var name='mbox'} (
                        {tmpl_var name='serial'}       ; serial, todays date + todays serial #
                        {tmpl_var name='refresh'}              ; refresh, seconds
                        {tmpl_var name='retry'}              ; retry, seconds
@@ -31,9 +31,6 @@
</tmpl_if>
<tmpl_if name="type" op='==' value='NAPTR'>
{tmpl_var name='name'}      NAPTR        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='NS'>
{tmpl_var name='name'}      NS        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='PTR'>
{tmpl_var name='name'}      PTR        {tmpl_var name='data'}
server/plugins-available/bind_plugin.inc.php
@@ -83,8 +83,10 @@
    function soa_update($event_name,$data) {
        global $app, $conf;
        
        //* Load libraries
        $app->uses("getconf,tpl");
        //* load the server configuration options
        $app->uses("getconf");
        $dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
        
        //* Write the domain file
@@ -94,10 +96,11 @@
        $zone = $data['new'];
        $tpl->setVar($zone);
        
        $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']);
        $tpl->setLoop('records',$records);
        $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.'.$zone['origin']);
        $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
        $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
        file_put_contents($filename,$tpl->grab());
        exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename);
        unset($tpl);
@@ -105,13 +108,13 @@
        unset($zone);
        
        //* rebuild the named.conf file if the origin has changed or when the origin is inserted.
        if($this->action == 'insert' || $data['old']['origin'] != $data['new']['origin']) {
        //if($this->action == 'insert' || $data['old']['origin'] != $data['new']['origin']) {
            $this->write_named_conf($data,$dns_config);
        }
        //}
        
        //* Delete old domain file, if domain name has been changed
        if($data['old']['origin'] != $data['new']['origin']) {
            $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.$data['old']['origin'];
            $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
            if(is_file($filename)) unset($filename);
        }
        
@@ -133,6 +136,7 @@
        //* Delete the domain file
        $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.$data['old']['origin'];
        if(is_file($filename)) unset($filename);
        $app->log("Deleting BIND domain file: ".$filename,LOGLEVEL_DEBUG);
        
        //* Reload bind nameserver
        $app->services->restartServiceDelayed('bind','reload');
@@ -180,14 +184,24 @@
    function write_named_conf($data, $dns_config) {
        global $app, $conf;
        
        $zones = $app->db->queryAllRecords("SELECT origin FROM dns_soa WHERE active = 'Y'");
        $tmps = $app->db->queryAllRecords("SELECT origin FROM dns_soa WHERE active = 'Y'");
        $zones = array();
        foreach($tmps as $tmp) {
            $zones[] = array(    'zone' => substr($tmp['origin'],0,-1),
                                'zonefile_path' => $dns_config['bind_zonefiles_dir'].'/pri.'.substr($tmp['origin'],0,-1)
                            );
        }
        
        $tpl = new tpl();
        $tpl->newTemplate("bind_named.conf.local.master");
        $tpl->setLoop('zones',$zones);
        
        file_put_contents($dns_config['named_conf_local_path'],$tpl->grab());
        $app->log("Writing BIND named.conf.local file: ".$dns_config['named_conf_local_path'],LOGLEVEL_DEBUG);
        unset($tpl);
        unset($zones);
        unset($tmps);
        
    }