From f429d744ad734a5bee8745b4f81c6e74c9cb5c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 18 Apr 2018 13:23:57 +0200 Subject: [PATCH] retrace: update roles from upstream --- roles/abrt/faf/defaults/main.yml | 8 ++++++++ roles/abrt/faf/meta/.galaxy_install_info | 2 +- roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 | 8 ++++++++ roles/abrt/retrace/meta/.galaxy_install_info | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml index a3d5f3ada5..f159510039 100644 --- a/roles/abrt/faf/defaults/main.yml +++ b/roles/abrt/faf/defaults/main.yml @@ -95,6 +95,14 @@ faf_web_on_root: true # important for production deployments faf_web_secret_key: not_a_secret + +# number of mails that can be sent per the time frame +faf_web_throttle_rate: 1 +# time to wait (in seconds) before another mail can be sent +faf_web_throttle_timeframe: 30 +# start the throttling after this number of mails is sent +faf_web_throttle_burst: 1 + ############################## # functionality checking # ############################## diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info index 99f214b2c8..5a9b3972d9 100644 --- a/roles/abrt/faf/meta/.galaxy_install_info +++ b/roles/abrt/faf/meta/.galaxy_install_info @@ -1 +1 @@ -{install_date: 'Mon Apr 16 11:37:27 2018', version: ''} +{install_date: 'Wed Apr 18 11:23:27 2018', version: ''} diff --git a/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 b/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 index 21c0d9d8fd..cebdc1a453 100644 --- a/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 +++ b/roles/abrt/faf/templates/etc-faf-plugins-web.conf.j2 @@ -48,3 +48,11 @@ type = {{ faf_web_cache_type }} memcached_host = localhost memcached_port = {{ memcached_port }} memcached_key_prefix = webfaf + +[throttle] +# Number of mails that can be sent per the time frame +rate = {{ faf_web_throttle_rate }} +# Time to wait (in seconds) before another mail can be sent +timeframe = {{ faf_web_throttle_timeframe }} +# Start the throttling after this number of mails is sent +burst = {{ faf_web_throttle_burst }} diff --git a/roles/abrt/retrace/meta/.galaxy_install_info b/roles/abrt/retrace/meta/.galaxy_install_info index 99f214b2c8..25b3bf9775 100644 --- a/roles/abrt/retrace/meta/.galaxy_install_info +++ b/roles/abrt/retrace/meta/.galaxy_install_info @@ -1 +1 @@ -{install_date: 'Mon Apr 16 11:37:27 2018', version: ''} +{install_date: 'Wed Apr 18 11:23:28 2018', version: ''}