paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push fail2ban version to 1.2

master
andryyy 2017-06-24 20:06:23 +02:00
parent c4c1bdf477
commit 47eb11338c
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/web/js/admin.js
View File

@ -69,7 +69,7 @@ jQuery(function($){
$.each(data, function (i, item) { $.each(data, function (i, item) {
item.message = escapeHtml(item.message); item.message = escapeHtml(item.message);
var danger_class = ["emerg", "alert", "crit", "err"]; var danger_class = ["emerg", "alert", "crit", "err"];
var warning_class = ["warning"]; var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"]; var info_class = ["notice", "info", "debug"];
if (jQuery.inArray(item.priority, danger_class) !== -1) { if (jQuery.inArray(item.priority, danger_class) !== -1) {
item.priority = '<span class="label label-danger">' + item.priority + '</span>'; item.priority = '<span class="label label-danger">' + item.priority + '</span>';
@ -103,6 +103,7 @@ jQuery(function($){
ft_fail2ban_logs = FooTable.init('#fail2ban_log', { ft_fail2ban_logs = FooTable.init('#fail2ban_log', {
"columns": [ "columns": [
{"name":"time","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleString();},"title":lang.time,"style":{"width":"170px"}}, {"name":"time","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleString();},"title":lang.time,"style":{"width":"170px"}},
{"name":"priority","title":lang.priority,"style":{"width":"80px"}},
{"name":"message","title":lang.message}, {"name":"message","title":lang.message},
], ],
"rows": $.ajax({ "rows": $.ajax({
@ -114,7 +115,19 @@ jQuery(function($){
}, },
success: function (data) { success: function (data) {
$.each(data, function (i, item) { $.each(data, function (i, item) {
var danger_class = ["emerg", "alert", "crit", "err"];
var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message); item.message = escapeHtml(item.message);
if (jQuery.inArray(item.priority, danger_class) !== -1) {
item.priority = '<span class="label label-danger">' + item.priority + '</span>';
}
else if (jQuery.inArray(item.priority, warning_class) !== -1) {
item.priority = '<span class="label label-warning">' + item.priority + '</span>';
}
else if (jQuery.inArray(item.priority, info_class) !== -1) {
item.priority = '<span class="label label-info">' + item.priority + '</span>';
}
}); });
} }
}), }),
@ -151,7 +164,7 @@ jQuery(function($){
success: function (data) { success: function (data) {
$.each(data, function (i, item) { $.each(data, function (i, item) {
var danger_class = ["emerg", "alert", "crit", "err"]; var danger_class = ["emerg", "alert", "crit", "err"];
var warning_class = ["warning"]; var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"]; var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message); item.message = escapeHtml(item.message);
if (jQuery.inArray(item.priority, danger_class) !== -1) { if (jQuery.inArray(item.priority, danger_class) !== -1) {
@ -199,7 +212,7 @@ jQuery(function($){
success: function (data) { success: function (data) {
$.each(data, function (i, item) { $.each(data, function (i, item) {
var danger_class = ["emerg", "alert", "crit", "err"]; var danger_class = ["emerg", "alert", "crit", "err"];
var warning_class = ["warning"]; var warning_class = ["warning", "warn"];
var info_class = ["notice", "info", "debug"]; var info_class = ["notice", "info", "debug"];
item.message = escapeHtml(item.message); item.message = escapeHtml(item.message);
if (jQuery.inArray(item.priority, danger_class) !== -1) { if (jQuery.inArray(item.priority, danger_class) !== -1) {

2
docker-compose.yml
View File

@ -311,7 +311,7 @@ services:
- acme - acme
fail2ban-mailcow: fail2ban-mailcow:
image: mailcow/fail2ban:1.1 image: mailcow/fail2ban:1.2
build: ./data/Dockerfiles/fail2ban build: ./data/Dockerfiles/fail2ban
depends_on: depends_on:
- dovecot-mailcow - dovecot-mailcow