From d80eaffd9cca25c9dbb95223ed8e60177cbb1ffc Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Fri, 17 Jun 2022 00:24:15 +0300 Subject: [PATCH] v6.1.0.0 Change log: https://roxy-wi.org/changelog.py#6_1 --- api/api.py | 11 +++++++++-- inc/users.js | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/api.py b/api/api.py index 08eff8d6..454d792c 100644 --- a/api/api.py +++ b/api/api.py @@ -68,14 +68,21 @@ def index(): 'nginx//action/stop': 'stop NGINX service by id or hostname or ip. METHOD: GET', 'nginx//action/restart': 'restart NGINX service by id or hostname or ip. METHOD: GET', 'nginx//config': 'get NGINX config from a server by id or hostname or ip. Headers: The full path to a config file, like: /etc/nginx/conf.d/default.conf. METHOD: GET', - 'nginx//config': 'upload NGINX config to a server by id or hostname or ip. Headers: action: save/reload/restart, config-file: the full path to the config, like /etc/nginx/conf.d/example.com.conf. Body must consist a whole HAProxy config. METHOD: POST', + 'nginx//config': 'upload NGINX config to a server by id or hostname or ip. Headers: action: save/reload/restart, config-file: the full path to the config, like /etc/nginx/conf.d/example.com.conf. Body must consist a whole NGINX config. METHOD: POST', 'apache/': 'show info about the Apache by id or hostname or ip. METHOD: GET', 'apache//status': 'show Apache status by id or hostname or ip. METHOD: GET', 'apache//action/start': 'start Apache service by id or hostname or ip. METHOD: GET', 'apache//action/stop': 'stop Apache service by id or hostname or ip. METHOD: GET', 'apache//action/restart': 'restart Apache service by id or hostname or ip. METHOD: GET', 'apache//config': 'get Apache config from a server by id or hostname or ip. Headers: The full path to a config file, like: /etc/httpd/conf.d/default.conf. METHOD: GET', - 'apache//config': 'upload Apache config to a server by id or hostname or ip. Headers: action: save/reload/restart, config-file: the full path to the config, like /etc/httpd/conf.d/example.com.conf. Body must consist a whole HAProxy config. METHOD: POST', + 'apache//config': 'upload Apache config to a server by id or hostname or ip. Headers: action: save/reload/restart, config-file: the full path to the config, like /etc/httpd/conf.d/example.com.conf. Body must consist a whole Apache config. METHOD: POST', + 'keepalived/': 'show info about the Keepalived by id or hostname or ip. METHOD: GET', + 'keepalived//status': 'show Keepalived status by id or hostname or ip. METHOD: GET', + 'keepalived//action/start': 'start Keepalived service by id or hostname or ip. METHOD: GET', + 'keepalived//action/stop': 'stop Keepalived service by id or hostname or ip. METHOD: GET', + 'keepalived//action/restart': 'restart Keepalived service by id or hostname or ip. METHOD: GET', + 'keepalived//config': 'get Keepalived config from a server by id or hostname or ip. METHOD: GET', + 'keepalived//config': 'upload Keepalived config to a server by id or hostname or ip. Headers: action: save/reload/restart. Body must consist a whole Keepalived config. METHOD: POST', } return dict(help=data) diff --git a/inc/users.js b/inc/users.js index f6f91e12..3f592b01 100644 --- a/inc/users.js +++ b/inc/users.js @@ -2331,7 +2331,7 @@ function updateService(service, action='update') { data = data.replace(/\s+/g,' '); if (data.indexOf('error:') != '-1' || data.indexOf('Failed') != '-1') { toastr.error(data); - } else if (data.indexOf('Complete!') != '-1' || data.indexOf('Unpacking!') != '-1'){ + } else if (data.indexOf('Complete!') != '-1' || data.indexOf('Unpacking') != '-1'){ toastr.clear(); toastr.success(service + ' has been '+action+'ed'); } else if (data.indexOf('Unauthorized') != '-1') {