Commit 22c91099 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'master' into 'stable-3.1'

Master



See merge request !302
parents b5f6a1a0 d1fcdc22
......@@ -445,6 +445,7 @@ if($install_mode == 'standard') {
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
$conf['services']['firewall'] = true;
$conf['bastille']['installed'] = true;
}
//* Configure Fail2ban
......
......@@ -69,7 +69,11 @@ if(isset($_GET['nav']) && $_GET['nav'] == 'top') {
$web_servers = $app->db->queryOneRecord("SELECT COUNT(*) as cnt FROM server WHERE web_server = 1 AND active = 1");
if($web_servers['cnt'] == 0) continue;
}
if($mt == 'vm'){
$vm_servers = $app->db->queryOneRecord("SELECT COUNT(*) AS cnt FROM server WHERE vserver_server = 1 AND active = 1");
if($vm_servers['cnt'] == 0) continue;
}
include_once $mt.'/lib/module.conf.php';
$language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment