github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v5.1.1.0 

Changelog: https://haproxy-wi.org/changelog.py#5_1_1
pull/304/head v5.1.1.0
Pavel Loginov 2021-05-01 13:49:28 +06:00
parent dda49db5fa
commit 0f02f84588
6 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/terraform/aws_instance.tf
View File

@ -1,5 +1,5 @@
module "aws_module" {
source = "github.com/Aidaho12/haproxy-wi-terraform-modules?ref=aws"
source = "github.com/hap-wi/haproxy-wi-terraform-modules?ref=aws"
region = var.region
instance_type = var.instance_type

2
app/scripts/terraform/do_instance.tf
View File

@ -1,5 +1,5 @@
module "do_module" {
source = "github.com/Aidaho12/haproxy-wi-terraform-modules?ref=digitalocean"
source = "github.com/hap-wi/haproxy-wi-terraform-modules?ref=digitalocean"
region = var.region
size = var.size

2
app/scripts/terraform/gcore_instance.tf
View File

@ -1,5 +1,5 @@
module "gcore_module" {
source = "github.com/Aidaho12/haproxy-wi-terraform-modules?ref=gcore"
source = "github.com/hap-wi/haproxy-wi-terraform-modules?ref=gcore"
region = var.region
instance_type = var.instance_type

8
app/templates/include/mon_installation.html
View File

@ -17,10 +17,10 @@
{% endif %}
</td>
<td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest Grafana and Prometheus server versions
HAProxy-WI will try to install the latest Grafana and Prometheus servers versions
</td>
<td class="padding10 first-collumn">
Before Install any Exporters install Grafana and Prometheus servers first
Before installing any exporters, first install Grafana and Prometheus servers
</td>
<td></td>
<td>
@ -34,7 +34,7 @@
<table>
<caption><h3>Install HAProxy Exporter</h3></caption>
<tr class="overviewHead">
<td class="padding10 first-collumn">Current instalation</td>
<td class="padding10 first-collumn">Current installation</td>
<td class="padding10 first-collumn" style="width: 30%;">Available Versions</td>
<td class="padding10 first-collumn" style="width: 30%;">Server</td>
<td></td>
@ -64,7 +64,7 @@
<table>
<caption><h3>Install Nginx Exporter</h3></caption>
<tr class="overviewHead">
<td class="padding10 first-collumn">Current instalation</td>
<td class="padding10 first-collumn">Current installation</td>
<td class="padding10 first-collumn" style="width: 30%;">Available Versions</td>
<td class="padding10 first-collumn" style="width: 30%;">Server</td>
<td></td>

46
inc/add.js
View File

@ -834,6 +834,7 @@ $( function() {
} );
$( "#add6" ).on( "click", function() {
$( "#tabs" ).tabs( "option", "active", 7 );
$( "#userlist_serv" ).selectmenu( "open" );
} );
$( "#add7" ).on( "click", function() {
$('.menu li ul li').each(function () {
@ -1013,20 +1014,25 @@ $( function() {
});
$( ".redirectListen" ).on( "click", function() {
resetProxySettings()
resetProxySettings();
$( "#tabs" ).tabs( "option", "active", 1 );
$( "#serv" ).selectmenu( "open" );
} );
$( ".redirectFrontend" ).on( "click", function() {
resetProxySettings()
$( "#tabs" ).tabs( "option", "active", 2 );
resetProxySettings();
var TabId = 2;
$( "#tabs" ).tabs( "option", "active", TabId );
$( "#serv"+TabId ).selectmenu( "open" );
} );
$( "#redirectBackend" ).on( "click", function() {
resetProxySettings()
$( "#tabs" ).tabs( "option", "active", 3 );
history.pushState('Add backend', 'Add backend', 'add.py#backend')
$( ".redirectBackend" ).on( "click", function() {
resetProxySettings();
var TabId = 3;
$( "#tabs" ).tabs( "option", "active", TabId );
$( "#serv"+TabId ).selectmenu( "open" );
} );
$( ".redirectSsl" ).on( "click", function() {
$( "#tabs" ).tabs( "option", "active", 4 );
$( "#serv5" ).selectmenu( "open" );
} );
$( "#create-http-listen" ).on( "click", function() {
@ -1182,6 +1188,18 @@ $( function() {
$("#backend_add_acl").click(function(){
make_actions_for_adding_acl_rule('#backend_acl');
});
$( "#serv" ).on('selectmenuchange',function() {
$('#name').focus();
});
$( "#serv2" ).on('selectmenuchange',function() {
$('#new_frontend').focus();
});
$( "#serv3" ).on('selectmenuchange',function() {
$('#new_backend').focus();
});
$( "#userlist_serv" ).on('selectmenuchange',function() {
$('#new_userlist').focus();
});
});
function resetProxySettings() {
$('[name=port]').val('');
@ -1204,7 +1222,11 @@ function resetProxySettings() {
function createHttp(TabId, proxy) {
$('[name=port]').val('80');
$('[name=server_port]').val('80');
$( "#tabs" ).tabs( "option", "active", TabId );
$( "#tabs" ).tabs( "option", "active", TabId );
if (TabId == 1) {
TabId = '';
}
$( "#serv"+TabId ).selectmenu( "open" );
history.pushState('Add '+proxy, 'Add '+proxy, 'add.py#'+proxy)
}
function createSsl(TabId, proxy) {
@ -1217,6 +1239,10 @@ function createSsl(TabId, proxy) {
$('#https-'+proxy).prop( "checked", true );
$('#https-'+proxy).checkboxradio("refresh");
$("#path-cert-"+proxy ).attr('required',true);
if (TabId == 1) {
TabId = '';
}
$( "#serv"+TabId ).selectmenu( "open" );
history.pushState('Add'+proxy, 'Add'+proxy, 'add.py#'+proxy)
}
function createHttps(TabId, proxy) {
@ -1227,6 +1253,10 @@ function createHttps(TabId, proxy) {
$( "#tabs" ).tabs( "option", "active", TabId );
$('#'+proxy+'-mode-select').val('tcp');
$('#'+proxy+'-mode-select').selectmenu('refresh');
if (TabId == 1) {
TabId = '';
}
$( "#serv"+TabId ).selectmenu( "open" );
history.pushState('Add'+proxy, 'Add'+proxy, 'add.py#'+proxy)
}
function confirmDeleteOption(id) {

3
inc/servers.css
View File

@ -2,6 +2,9 @@
width: 10em;
}
.first-collumn {
width: 15%;
}
#ajax-servers .first-collumn {
width: 10%;
}
.container {