From 6f781567ecbf4a75c2474b6ae56384ea603f6cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=80=D0=B0=D0=B1=D0=B0=D0=BD=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=A4=D0=B5=D0=B4=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= Date: Tue, 16 Apr 2024 06:41:08 +0000 Subject: [PATCH] fix: fix configuration and refactor --- tsm_labs/meta/main.yml | 46 +-------------------- tsm_labs/tasks/main.yml | 71 ++++++++++++++------------------ tsm_labs/templates/nginx.conf.j2 | 1 - tsm_labs/vars/main.yml | 3 +- 4 files changed, 34 insertions(+), 87 deletions(-) diff --git a/tsm_labs/meta/main.yml b/tsm_labs/meta/main.yml index 7343d8c..1418a86 100644 --- a/tsm_labs/meta/main.yml +++ b/tsm_labs/meta/main.yml @@ -1,52 +1,10 @@ +--- galaxy_info: author: Serjio description: The first try company: Bonch - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 license: BSD-3-Clause - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 + min_ansible_version: "2.1" galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/tsm_labs/tasks/main.yml b/tsm_labs/tasks/main.yml index 61b1256..e34d27e 100644 --- a/tsm_labs/tasks/main.yml +++ b/tsm_labs/tasks/main.yml @@ -1,45 +1,36 @@ --- - - name: Update all packages Ubuntu - when: ansible_os_family == 'Debian' - apt: - update_cache: yes - upgrade: yes - - - name: Update all packages CentOS - when: ansible_os_family == 'RedHat' - yum: - name: '*' - state: latest - - - name: Install nginx 'Ubuntu' - when: ansible_os_family == 'Debian' - ansible.builtin.apt: - package: - - nginx - state: present - update_cache: yes - - - name: Install nginx 'RedHat' - when: ansible_os_family == 'RedHat' - ansible.builtin.yum: - name: - - nginx - state: present +- name: Update all packages Ubuntu + when: ansible_os_family == 'Debian' + ansible.builtin.apt: + update_cache: true + upgrade: true - - name: Copy config nginx - ansible.builtin.template: - src: nginx.conf.j2 - dest: /etc/nginx/nginx.conf - owner: root - group: root - mode: '0644' - notify: Reload nginx service +- name: Update all packages CentOS + when: ansible_os_family == 'RedHat' + ansible.builtin.yum: + name: "*" + state: latest +- name: Install nginx 'Ubuntu' + when: ansible_os_family == 'Debian' + ansible.builtin.apt: + package: + - nginx + state: present + update_cache: true +- name: Install nginx 'RedHat' + when: ansible_os_family == 'RedHat' + ansible.builtin.yum: + name: + - nginx + state: present - - - - - - +- name: Copy config nginx + ansible.builtin.template: + src: nginx.conf.j2 + dest: /etc/nginx/nginx.conf + owner: root + group: root + mode: "0644" + notify: Reload nginx service diff --git a/tsm_labs/templates/nginx.conf.j2 b/tsm_labs/templates/nginx.conf.j2 index 3a18c90..860d660 100644 --- a/tsm_labs/templates/nginx.conf.j2 +++ b/tsm_labs/templates/nginx.conf.j2 @@ -32,7 +32,6 @@ http { proxy_buffers 4 64k; proxy_busy_buffers_size 64k; server_names_hash_bucket_size 64; - include /etc/nginx/modules-enabled/*.conf; include /etc/nginx/conf.d/*.conf; include /etc/nginx/sites-enabled/*; } diff --git a/tsm_labs/vars/main.yml b/tsm_labs/vars/main.yml index 796ac5f..ab4cf0a 100644 --- a/tsm_labs/vars/main.yml +++ b/tsm_labs/vars/main.yml @@ -1,5 +1,4 @@ --- -worker_connections: auto +worker_connections: 512 gzip_min_length: 1000 client_max_body_size: 512m - -- 2.54.0