diff --git a/app/create_db.py b/app/create_db.py index a405e681..16875ba5 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -459,7 +459,7 @@ def update_db_v_3_8_1(**kwargs): def update_ver(**kwargs): con, cur = get_cur() - sql = """update version set version = '3.9.2'; """ + sql = """update version set version = '3.9.3'; """ try: cur.execute(sql) con.commit() diff --git a/app/funct.py b/app/funct.py index 511bcb80..ed83fbf5 100644 --- a/app/funct.py +++ b/app/funct.py @@ -53,12 +53,14 @@ def logging(serv, action, **kwargs): try: IP = cgi.escape(os.environ["REMOTE_ADDR"]) + except: + IP = '' + try: cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) user_uuid = cookie.get('uuid') login = sql.get_user_name_by_uuid(user_uuid.value) - except: - IP = '' - login = kwargs.get('login') + except: + login = '' if kwargs.get('alerting') == 1: mess = get_data('date_in_log') + action + "\n" diff --git a/app/options.py b/app/options.py index 8fd1f8d6..8f9b485f 100644 --- a/app/options.py +++ b/app/options.py @@ -663,6 +663,8 @@ if form.getvalue('masteradd'): if ssh_enable == 0: ssh_key_name = '' + proxy_serv = proxy if proxy is not None else "" + os.system("cp scripts/%s ." % script) commands = [ "chmod +x "+script +" && ./"+script +" PROXY=" + proxy_serv+ diff --git a/app/templates/sections.html b/app/templates/sections.html index 27f6cf7c..6ffa11ca 100644 --- a/app/templates/sections.html +++ b/app/templates/sections.html @@ -46,6 +46,8 @@