Skip to content

Commit 02c0ab6

Browse files
authoredApr 5, 2022
Add TimeoutStartSec parameter (#182)
1 parent 8ff75ac commit 02c0ab6

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed
 

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ BREAKING CHANGES:
88
* Rename multiple `nginx_app_protect_*` parameters and tags to `nginx_app_protect_waf_*` to aid in disambiguation.
99
* Cleanup deprecated Alpine Linux tasks.
1010
* Remove `nginx_app_protect_configure` parameter since it has limited functionality given the `nginx_app_protect_*_policy_file_enable` parameters.
11+
* The `nginx_app_protect_timeout` setting previous only applied to service stop operations. This parameter has been changed to `nginx_app_protect_timeoutstopsec` to better reflect its usage, and a new parameter, `nginx_app_protect_timeoutstartsec` has been introduced to tweak service start operation timeouts.
1112

1213
FEATURES:
1314

@@ -26,7 +27,6 @@ BUG FIXES:
2627
* Role was failing to uninstall NGINX App Protect DoS packages when the `nginx_app_protect_dos_state` was set to `absent`.
2728
* Uninstallation scenario was unintentionally creating repository entries.
2829
* Ansible check mode runs will no longer fail if NGINX has not yet been installed.
29-
* The `nginx_app_protect_timeout` setting previous only applied to service stop operations. Now includes both start and stop operations.
3030

3131
## 0.7.1 (February 16, 2022)
3232

‎defaults/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ nginx_app_protect_start: true
9797
# Increase NGINX service timeout to accommodate ruleset loading from default 90s.
9898
# Default is commented out.
9999
nginx_app_protect_service_modify: true
100-
nginx_app_protect_timeout: 180
100+
nginx_app_protect_timeoutstartsec: 180
101+
nginx_app_protect_timeoutstopcsec: 180
101102

102103
# Copy local NGINX App Protect security policy to host
103104
nginx_app_protect_security_policy_file_enable: false

‎molecule/advanced/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
nginx_app_protect_remove_license: false
1313
nginx_app_protect_waf_install_signatures: true
1414
nginx_app_protect_waf_install_threat_campaigns: true
15-
nginx_app_protect_timeout: 180
15+
nginx_app_protect_timeoutstartsec: 180
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
[Service]
2-
# Override default 90 second timeout
3-
TimeoutSec={{ nginx_app_protect_timeout }}
2+
{% if nginx_app_protect_timeoutstartsec is defined %}
3+
TimeoutStartSec={{ nginx_app_protect_timeoutstartsec }}
4+
{% endif %}
5+
{% if nginx_app_protect_timeoutstopsec is defined %}
6+
TimeoutStopSec={{ nginx_app_protect_timeoutstopsec }}
7+
{% endif %}

0 commit comments

Comments
 (0)
Please sign in to comment.