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

v7.1.0.0 

Changelog: https://roxy-wi.org/changelog#7.1.0
pull/372/head
Aidaho 2023-12-16 12:48:58 +03:00
parent ec9084c7ce
commit 3ed145aac4
4 changed files with 22 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/service/ha_cluster.py
View File

@ -121,7 +121,7 @@ def delete_cluster(cluster_id: int) -> str:
except Exception as e:
raise Exception(f'error: Cannot update master on slave {slave_ip}: {e}')
roxywi_common.logging(cluster_id, f'Cluster has been deleted', keep_history=1, roxywi=1, service='HA cluster')
roxywi_common.logging(cluster_id, 'Cluster has been deleted', keep_history=1, roxywi=1, service='HA cluster')
return 'ok'

11
app/modules/service/installation.py
View File

@ -319,7 +319,8 @@ def generate_service_inv(json_data: json, install_service: str) -> object:
def run_ansible(inv: object, server_ips: str, ansible_role: str, service: str) -> object:
inventory = f'/var/www/haproxy-wi/app/scripts/ansible/inventory/{ansible_role}.json'
inventory_path = '/var/www/haproxy-wi/app/scripts/ansible/inventory'
inventory = f'{inventory_path}/{ansible_role}.json'
proxy = sql.get_setting('proxy')
proxy_serv = ''
tags = ''
@ -346,10 +347,7 @@ def run_ansible(inv: object, server_ips: str, ansible_role: str, service: str) -
'ANSIBLE_DISPLAY_OK_HOSTS': 'no',
'ANSIBLE_SHOW_CUSTOM_STATS': 'no',
'ANSIBLE_DISPLAY_SKIPPED_HOSTS': "no",
'ANSIBLE_CALLBACK_PLUGINS': "/var/www/haproxy-wi/app/scripts/ansible/callback_plugins",
'ANSIBLE_CALLBACKS_ENABLED': "roxywi",
'ANSIBLE_STDOUT_CALLBACK': "roxywi",
'ORIGINAL_STDOUT_CALLBACK': "roxywi",
'ANSIBLE_DEPRECATION_WARNINGS': "no",
'ANSIBLE_HOST_KEY_CHECKING': "no",
'ACTION_WARNINGS': "no",
'LOCALHOST_WARNING': "no",
@ -368,6 +366,9 @@ def run_ansible(inv: object, server_ips: str, ansible_role: str, service: str) -
if os.path.isfile(inventory):
os.remove(inventory)
if not os.path.isdir(inventory_path):
os.makedirs(inventory_path)
try:
with open(inventory, 'a') as invent:
invent.write(str(inv))

8
inc/ha.js
View File

@ -429,7 +429,13 @@ function installServiceCluster(jsonData, service, progress_step) {
jsonData: JSON.stringify(jsonData),
},
success: function (data) {
checkInstallResp(data, servers['cluster_id'], progress_step, servers["name"], li_id, nice_service_name[service]);
try {
if (data.indexOf('error:') != '-1') {
toastr.error(data);
}
} catch (e) {
checkInstallResp(data, servers['cluster_id'], progress_step, servers["name"], li_id, nice_service_name[service]);
}
}
});
}

92
inc/users.js
View File

@ -7,42 +7,6 @@ $( function() {
var cancel_word = $('#translate').attr('data-cancel');
$( "#backup_tabs" ).tabs();
$('#install').click(function() {
// $("#ajax").html('')
// var syn_flood = 0;
// var docker = 0;
// var jsonData = {'servers': {'0': {}}, 'services': {'haproxy': {}}};
// if ($('#syn_flood').is(':checked')) {
// syn_flood = '1';
// }
// if ($('#haproxy_docker').is(':checked')) {
// docker = '1';
// }
// if ($('#haproxyaddserv').val() == '------' || $('#haproxyaddserv').val() === null) {
// var select_server = $('#translate').attr('data-select_server');
// toastr.warning(select_server);
// return false
// }
// jsonData['syn_flood'] = syn_flood;
// jsonData['servers']['0']['ip'] = $('#haproxyaddserv').val();
// jsonData['servers']['0']['master'] = '0';
// jsonData['servers']['0']['name'] = $('#haproxyaddserv option:selected').text();
// jsonData['servers']['0']['version'] = $('#hapver option:selected').val();
// jsonData['services']['haproxy']['enabled'] = 1;
// jsonData['services']['haproxy']['docker'] = docker;
// $("#ajax").html(wait_mess);
// $.ajax({
// url: "/app/install/haproxy/" + $('#haproxyaddserv').val(),
// data: {
// jsonData: JSON.stringify(jsonData),
// token: $('#token').val()
// },
// type: "POST",
// success: function (data) {
// data = data.replace(/\s+/g, ' ');
// parseAnsibleJsonOutput(data, 'HAProxy');
// $("#haproxyaddserv").trigger("selectmenuchange");
// }
// });
installService('haproxy')
});
$('#nginx_install').click(function() {
@ -2911,57 +2875,17 @@ function installService(service) {
},
type: "POST",
success: function (data) {
// data = data.replace(/\s+/g, ' ');
parseAnsibleJsonOutput(data, nice_names[service]);
$("#" + service + "yaddserv").trigger("selectmenuchange");
try {
if (data.indexOf('error:') != '-1') {
toastr.error(data);
}
} catch (e) {
parseAnsibleJsonOutput(data, nice_names[service]);
$("#" + service + "yaddserv").trigger("selectmenuchange");
}
}
});
}
// function installService(service) {
// $("#ajax").html('')
// var syn_flood = 0;
// var docker = 0;
// if ($('#' + service + '_syn_flood').is(':checked')) {
// syn_flood = '1';
// }
// if ($('#' + service + '_docker').is(':checked')) {
// docker = '1';
// }
// if ($('#' + service + 'addserv').val() == '------') {
// var select_server = $('#translate').attr('data-select_server');
// toastr.warning(select_server);
// return false
// }
// $("#ajax").html(wait_mess);
// $.ajax({
// url: "/app/install/" + service + "/" + $('#' + service + 'addserv').val(),
// data: {
// syn_flood: syn_flood,
// docker: docker,
// token: $('#token').val()
// },
// type: "POST",
// success: function (data) {
// data = data.replace(/\s+/g, ' ');
// $("#ajax").html('')
// if (data.indexOf('error:') != '-1' || data.indexOf('FAILED') != '-1' || data.indexOf('UNREACHABLE') != '-1') {
// toastr.clear();
// var p_err = show_pretty_ansible_error(data);
// toastr.error(p_err);
// } else if (data.indexOf('success') != '-1') {
// toastr.clear();
// toastr.success(data);
// $('#' + service + 'addserv').trigger("selectmenuchange");
// } else if (data.indexOf('Info') != '-1') {
// toastr.clear();
// toastr.info(data);
// } else {
// toastr.clear();
// toastr.info(data);
// }
// }
// });
// }
function showServiceVersion(service) {
$.ajax({
url: "/app/install/" + service + "/version/" + $('#' + service + 'addserv option:selected').val(),