Merge branch 'feature/mysql-port' into 'master'

Marius Cramer

2015-05-19 6f6aa983d80882d10038945c10d7dedf572e0641

 install/dist/lib/debian60.lib.php

@@ -127,6 +127,7 @@
      $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
      $content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
      $content = str_replace('{server_id}', $conf['server_id'], $content);
      wf($config_dir.'/'.$configfile, $content);

@@ -153,10 +154,6 @@
        copy('tpl/dovecot_fail2ban_jail.local.master','/etc/fail2ban/jail.local');
   */
   }

    public function configure_xmpp() {
        parent::configure_xmpp();
    }

}