Skip to content

Bump ansible-lint from 6.14.2 to 6.14.4 in /.github/workflows/requirements #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
skip_list:
- args[module]
- name[template]
- yaml[line-length]
2 changes: 1 addition & 1 deletion .github/workflows/requirements/requirements_molecule.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ansible-core==2.14.4
jinja2==3.1.2
ansible-lint==6.14.2
ansible-lint==6.14.4
yamllint==1.30.0
molecule[docker]==4.0.4
docker==6.0.1
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ENHANCEMENTS:

- Refactor the OSS BSD installation process to consolidate tasks and avoid Ansible Lint warnings.
- Refactor handlers to avoid Ansible Lint warnings.
- Enable SELinux configuration tasks on Oracle Linux OS.

## 0.24.0 (January 29, 2023)
Expand Down
23 changes: 20 additions & 3 deletions handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
listen: (Handler) Run NGINX

- name: (Handler) Check NGINX
ansible.builtin.command: nginx -t
ansible.builtin.command:
cmd: nginx -t
args:
chdir: "{{ ((ansible_facts['system'] | lower is not search('bsd')) | ternary('/etc/nginx', '/usr/local/sbin')) }}"
register: config_check
Expand All @@ -41,5 +42,21 @@
name: amplify-agent
state: started

- name: (Handler) Run logrotate
ansible.builtin.command: logrotate -f /etc/logrotate.d/nginx
- name: (Handler) Start logrotate
ansible.builtin.command:
cmd: logrotate -f /etc/logrotate.d/nginx
register: logrotate_check
ignore_errors: true
check_mode: false
changed_when: false
listen: (Handler) Run logrotate

- name: (Handler) Print logrotate error if config check fails
ansible.builtin.debug:
var: logrotate_check.stderr_lines
failed_when: logrotate_check['rc'] != 0
when:
- logrotate_check['stderr_lines'] is defined
- logrotate_check['stderr_lines'] != []
- logrotate_check['rc'] != 0
listen: (Handler) Run logrotate
4 changes: 3 additions & 1 deletion tasks/opensource/install-bsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
when: ansible_facts['system'] == 'NetBSD'
block:
- name: (NetBSD) {{ nginx_setup | capitalize }} NGINX package
community.general.pkgin: nginx{{ nginx_version | default('') }}
community.general.pkgin:
name: nginx{{ nginx_version | default('') }}
state: "{{ nginx_state }}"
when: nginx_bsd_install_packages | bool
notify: (Handler) Run NGINX

Expand Down