Skip to content

Commit 6ae379f

Browse files
authored
Add TimeoutStartSec parameter (#505)
1 parent 2b1aeba commit 6ae379f

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/workflows/requirements/requirements_ansible.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ collections:
55
- name: ansible.posix
66
version: 1.3.0
77
- name: community.docker
8-
version: 2.2.1
8+
version: 2.3.0

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ FEATURES:
99

1010
ENHANCEMENTS:
1111

12-
* Bump the Ansible `community.general` collection to `4.6.1` and `community.docker` collection to `2.2.1`.
12+
* Bump the Ansible `community.general` collection to `4.6.1` and `community.docker` collection to `2.3.0`.
1313
* Streamline configuring SELinux.
14+
* Add `TimeoutStartSec` parameter to Systemd template.
1415

1516
BUG FIXES:
1617

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
2929
- name: ansible.posix
3030
version: 1.3.0
3131
- name: community.docker # Only required if you plan to use Molecule (see below)
32-
version: 2.2.1
32+
version: 2.3.0
3333
```
3434
3535
**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.

defaults/main/systemd.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ nginx_service_overridepath: /etc/systemd/system/nginx.service.d
1414
# Default is override.conf
1515
nginx_service_overridefilename: override.conf
1616

17-
# Set service timeout for systemd systems in seconds (default: 90)
17+
# Set service timeout for systemd systems in seconds
1818
# [Service]
19+
# TimeoutStartSec=90
1920
# TimeoutStopSec=90
2021
# Default is to comment this out
22+
# nginx_service_timeoutstartsec: 90
2123
# nginx_service_timeoutstopsec: 90
2224

2325
# Set the restart policy for systemd systems

templates/services/nginx.service.override.conf.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[Service]
2+
{% if nginx_service_timeoutstartsec is defined %}
3+
TimeoutStartSec={{ nginx_service_timeoutstartsec }}
4+
{% endif %}
25
{% if nginx_service_timeoutstopsec is defined %}
3-
TimeoutStopSec={{ nginx_service_timeoutstopsec | default(90) }}
6+
TimeoutStopSec={{ nginx_service_timeoutstopsec }}
47
{% endif %}
58
{% if nginx_service_restartonfailure is defined %}
69
Restart=on-failure

0 commit comments

Comments
 (0)