diff --git a/app/funct.py b/app/funct.py index 6fb61e49..fe7cd6cb 100644 --- a/app/funct.py +++ b/app/funct.py @@ -233,7 +233,7 @@ def telegram_send_mess(mess, **kwargs): channel_name = telegram.chanel_name if token_bot == '' or channel_name == '': - mess = " error: Can't send message. Add Telegram channel before use alerting at this servers group" + mess = " Can't send message. Add Telegram channel before use alerting at this servers group" print(mess) logging('localhost', mess, haproxywi=1) sys.exit() diff --git a/app/scripts/ansible/roles/docker/tasks/docker-users.yml b/app/scripts/ansible/roles/docker/tasks/docker-users.yml new file mode 100644 index 00000000..aeb21241 --- /dev/null +++ b/app/scripts/ansible/roles/docker/tasks/docker-users.yml @@ -0,0 +1,7 @@ +--- +- name: Ensure docker users are added to the docker group. + user: + name: "{{ item }}" + groups: docker + append: true + with_items: "{{ docker_users }}" \ No newline at end of file diff --git a/app/sql.py b/app/sql.py index f4e57b26..a954178f 100644 --- a/app/sql.py +++ b/app/sql.py @@ -752,7 +752,7 @@ def get_dick_permit(**kwargs): else: token = '' only_group = kwargs.get('only_group') - disable = '' + disable = 'enable = 1' haproxy = '' nginx = '' keepalived = '' @@ -763,7 +763,7 @@ def get_dick_permit(**kwargs): else: type_ip = "and type_ip = 0" if kwargs.get('disable') == 0: - disable = 'or enable = 0' + disable = '(enable = 1 or enable = 0)' if kwargs.get('ip'): ip = "and ip = '%s'" % kwargs.get('ip') if kwargs.get('haproxy'): @@ -776,11 +776,10 @@ def get_dick_permit(**kwargs): if funct.check_user_group(token=token): cursor = conn.cursor() if grp == '1' and not only_group: - sql = """ select * from servers where enable = 1 {} {} {} {} {} order by pos""" .format(disable, type_ip, nginx, keepalived, ip) + sql = """ select * from servers where {} {} {} {} {} order by pos""" .format(disable, type_ip, nginx, keepalived, ip) else: - sql = """ select * from servers where groups = '{group}' and (enable = 1 {disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} order by pos + sql = """ select * from servers where groups = '{group}' and ({disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} order by pos """.format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived) - try: cursor.execute(sql) except Exception as e: diff --git a/app/templates/delver.html b/app/templates/delver.html index 7af77986..3de1fcc1 100644 --- a/app/templates/delver.html +++ b/app/templates/delver.html @@ -36,6 +36,13 @@ Here you can work with previous versions of {%if service == 'keepalived' %}Keepalived{%elif service == 'nginx' %}Nginx{%else%}HAProxy{%endif%} configs. Roll back to them, view or delete {% endif %} + {% if open %} + {% for select in selects %} + {% if select.2 == serv %} + + {% endif %} + {% endfor %} + {% endif %} {% endif %} {% endblock %} diff --git a/app/versions.py b/app/versions.py index a3f962c7..d3d332a1 100644 --- a/app/versions.py +++ b/app/versions.py @@ -67,7 +67,8 @@ if serv is not None and form.getvalue('del') is not None: else: os.remove(os.path.join(configs_dir, form.getvalue(get))) file.add(form.getvalue(get) + "
") - funct.logging(serv, "versions.py were deleted configs: %s" % form.getvalue(get)) + funct.logging(serv, "Version of config has been deleted: %s" % form.getvalue(get), login=1, + keep_history=1, service=service) except OSError as e: stderr = "Error: %s - %s." % (e.filename,e.strerror) @@ -77,7 +78,8 @@ if serv is not None and form.getvalue('config') is not None: aftersave = 1 try: - funct.logging(serv, "versions.py upload old config %s" % configver) + funct.logging(serv, "Version of config has been uploaded %s" % configver, login=1, + keep_history=1, service=service) except Exception: pass