DB was created')
+ print('
DB was created
')
create_db.update_all()
print('
Now you can login, default: admin/admin
')
diff --git a/cgi-bin/options.py b/cgi-bin/options.py
index 6c07b26..f34f90e 100644
--- a/cgi-bin/options.py
+++ b/cgi-bin/options.py
@@ -7,8 +7,6 @@ import funct
import ovw
from configparser import ConfigParser, ExtendedInterpolation
-options = [ "acl", "http-request", "http-response", "set-uri", "set-url", "set-header", "add-header", "del-header", "replace-header", "path_beg", "url_beg()", "urlp_sub()", "tcpka", "tcplog", "forwardfor", "option" ]
-
path_config = "haproxy-webintarface.config"
config = ConfigParser(interpolation=ExtendedInterpolation())
config.read(path_config)
@@ -18,18 +16,15 @@ form = cgi.FieldStorage()
req = form.getvalue('req')
serv = form.getvalue('serv')
act = form.getvalue('act')
+backend = form.getvalue('backend')
print('Content-type: text/html\n')
-
-if req is not None:
- if req is 1:
- for i in options:
- if req in i:
- print(i)
- else:
- for i in options:
- print(i)
-
-backend = form.getvalue('backend')
+
+if form.getvalue('getcert') is not None and serv is not None:
+ commands = [ "ls -1t /etc/ssl/certs/ |grep pem" ]
+ funct.ssh_command(serv, commands, ip="1")
+
+
+
if backend is not None:
cmd='echo "show backend" |nc %s 1999' % serv
diff --git a/cgi-bin/settings.py b/cgi-bin/settings.py
index 2c71e94..fe6058d 100644
--- a/cgi-bin/settings.py
+++ b/cgi-bin/settings.py
@@ -23,7 +23,6 @@ print('
Admin area: View settings
'
for section_name in config.sections():
print('Section:', section_name)
- #print(' Options:', config.options(section_name))
for name, value in config.items(section_name):
print(' {} = {}'.format(name, value))
print()
diff --git a/cgi-bin/users.py b/cgi-bin/users.py
index 3c1cf7f..2f0b260 100644
--- a/cgi-bin/users.py
+++ b/cgi-bin/users.py
@@ -121,7 +121,7 @@ print('
Virt(?)'
'| Slave for (?) | '
' | '
' | '
diff --git a/inc/script.js b/inc/script.js
index 2fc0a4d..0b475f8 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -529,12 +529,16 @@ $( function() {
serv: $("#serv").val()
},
success: function( data ) {
- response(data.split("\n"));
+ data = data.replace(/\s+/g,' ');
+ response(data.split(" "));
}
} );
},
autoFocus: true,
- minLength: -1
+ minLength: -1,
+ select: function( event, ui ) {
+ $('#listen-port').focus();
+ }
});
$( "#ip1" ).autocomplete({
source: function( request, response ) {
@@ -545,10 +549,11 @@ $( function() {
url: "options.py",
data: {
ip: request.term,
- serv: $("#serv").val()
+ serv: $("#serv2").val()
},
success: function( data ) {
- response(data.split("\n"));
+ data = data.replace(/\s+/g,' ');
+ response(data.split(" "));
}
} );
},
@@ -599,4 +604,55 @@ $( function() {
$("#optionsInput2").append(ui.item.value + " ")
}
});
+ $( "#path-cert-listen" ).autocomplete({
+ source: function( request, response ) {
+ $.ajax( {
+ url: "options.py",
+ data: {
+ getcert:1,
+ serv: $("#serv").val()
+ },
+ success: function( data ) {
+ data = data.replace(/\s+/g,' ');
+ response(data.split(" "));
+ }
+ } );
+ },
+ autoFocus: true,
+ minLength: -1
+ });
+ $( "#path-cert-frontend" ).autocomplete({
+ source: function( request, response ) {
+ $.ajax( {
+ url: "options.py",
+ data: {
+ getcert:1,
+ serv: $("#serv2").val()
+ },
+ success: function( data ) {
+ data = data.replace(/\s+/g,' ');
+ response(data.split(" "));
+ }
+ } );
+ },
+ autoFocus: true,
+ minLength: -1
+ });
+ $( "#path-cert-backend" ).autocomplete({
+ source: function( request, response ) {
+ $.ajax( {
+ url: "options.py",
+ data: {
+ getcert:1,
+ serv: $("#serv3").val()
+ },
+ success: function( data ) {
+ data = data.replace(/\s+/g,' ');
+ response(data.split(" "));
+ }
+ } );
+ },
+ autoFocus: true,
+ minLength: -1
+ });
});
\ No newline at end of file
diff --git a/inc/style.css b/inc/style.css
index 40acd0a..970265b 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -528,6 +528,7 @@ a:focus {
cursor: pointer;
font-weight: bold;
padding-left: 10px;
+ margin-bottom: 10px;
}
.alert-danger {
color: #a94442;
diff --git a/requirements.txt b/requirements.txt
index d2b6394..5e842c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,4 @@ numpy==1.14.0
matplotlib==2.1.2
urllib3==1.22
future==0.13.1
-mysqlclient==1.3.12
\ No newline at end of file
+mysql-connector-python==8.0.11
\ No newline at end of file