Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/requirements/requirements_ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ collections:
- name: ansible.posix
version: 1.3.0
- name: community.docker
version: 2.2.1
version: 2.3.0
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ FEATURES:

ENHANCEMENTS:

* Bump the Ansible `community.general` collection to `4.6.1` and `community.docker` collection to `2.2.1`.
* Bump the Ansible `community.general` collection to `4.6.1` and `community.docker` collection to `2.3.0`.
* Streamline configuring SELinux.
* Add `TimeoutStartSec` parameter to Systemd template.

BUG FIXES:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
- name: ansible.posix
version: 1.3.0
- name: community.docker # Only required if you plan to use Molecule (see below)
version: 2.2.1
version: 2.3.0
```

**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.
Expand Down
4 changes: 3 additions & 1 deletion defaults/main/systemd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ nginx_service_overridepath: /etc/systemd/system/nginx.service.d
# Default is override.conf
nginx_service_overridefilename: override.conf

# Set service timeout for systemd systems in seconds (default: 90)
# Set service timeout for systemd systems in seconds
# [Service]
# TimeoutStartSec=90
# TimeoutStopSec=90
# Default is to comment this out
# nginx_service_timeoutstartsec: 90
# nginx_service_timeoutstopsec: 90

# Set the restart policy for systemd systems
Expand Down
5 changes: 4 additions & 1 deletion templates/services/nginx.service.override.conf.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[Service]
{% if nginx_service_timeoutstartsec is defined %}
TimeoutStartSec={{ nginx_service_timeoutstartsec }}
{% endif %}
{% if nginx_service_timeoutstopsec is defined %}
TimeoutStopSec={{ nginx_service_timeoutstopsec | default(90) }}
TimeoutStopSec={{ nginx_service_timeoutstopsec }}
{% endif %}
{% if nginx_service_restartonfailure is defined %}
Restart=on-failure
Expand Down