Fixed: FS#3506 - Firewall rules get mirrored to slave servers

Till Brehm

2014-07-27 5332dc4d052b4ff48be343928344eb961dc4f027

Fixed: FS#3506 - Firewall rules get mirrored to slave servers

 server/plugins-available/firewall_plugin.inc.php

@@ -76,29 +76,31 @@
        global $app, $conf;

        //* load the server configuration options
        $app->uses('getconf');
        $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
        if($server_config['firewall'] == 'ufw') {
            $this->ufw_update($event_name, $data);
        } else {
            $this->bastille_update($event_name, $data);
        if(!$data['mirrored']) {
            $app->uses('getconf');
            $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
            if($server_config['firewall'] == 'ufw') {
                $this->ufw_update($event_name, $data);
            } else {
                $this->bastille_update($event_name, $data);
            }
        }

    }

    public function delete($event_name, $data) {
        global $app, $conf;

        //* load the server configuration options
        $app->uses('getconf');
        $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
        if(!$data['mirrored']) {
            $app->uses('getconf');
            $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');

        if($server_config['firewall'] == 'ufw') {
            $this->ufw_delete($event_name, $data);
        } else {
            $this->bastille_delete($event_name, $data);
            if($server_config['firewall'] == 'ufw') {
                $this->ufw_delete($event_name, $data);
            } else {
                $this->bastille_delete($event_name, $data);
            }
        }

    }

    private function ufw_update($event_name, $data) {