diff --git a/app/options.py b/app/options.py index 449bb8fd..cbf24d12 100644 --- a/app/options.py +++ b/app/options.py @@ -1911,7 +1911,7 @@ if form.getvalue('new_metrics'): serv = form.getvalue('server') hostname = sql.get_hostname_by_server_ip(serv) time_range = form.getvalue('time_range') - metric = sql.select_metrics(serv, time_range=time_range) + metric = sql.select_metrics(serv, 'haproxy', time_range=time_range) metrics = {'chartData': {}} metrics['chartData']['labels'] = {} labels = '' diff --git a/app/scripts/ansible/roles/nginx_common/tasks/main.yml b/app/scripts/ansible/roles/nginx_common/tasks/main.yml index 4d7ef454..8d1c9305 100644 --- a/app/scripts/ansible/roles/nginx_common/tasks/main.yml +++ b/app/scripts/ansible/roles/nginx_common/tasks/main.yml @@ -3,6 +3,10 @@ set_fact: ansible_port: "{{SSH_PORT}}" +- name: Add NGINX + ansible.builtin.user: + name: nginx + group: nginx - name: check if Nginx is installed package_facts: @@ -17,6 +21,8 @@ path: "{{nginx_dir}}" state: directory mode: o=rx + owner: nginx + group: nginx when: "'nginx' not in ansible_facts.packages"