launchpad-reviewers team mailing list archive

[Guruprasad <mp+447084@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:launchpad-scripts-run-process-mail-when-configured into launchpad:master.

Commit message:
charm/launchpad-scripts: Run the process-mail script only if the required configuration is present

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/447084
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:launchpad-scripts-run-process-mail-when-configured into launchpad:master.

diff --git a/charm/launchpad-scripts/templates/crontab.j2 b/charm/launchpad-scripts/templates/crontab.j2
index 27a29e2..a2789c0 100644
--- a/charm/launchpad-scripts/templates/crontab.j2
+++ b/charm/launchpad-scripts/templates/crontab.j2
@@ -90,8 +90,10 @@ LPCONFIG=launchpad-scripts
 # Person notifications
 */5 * * * * {{ code_dir }}/cronscripts/send-person-notifications.py -q --log-file=INFO:{{ logs_dir }}/send-person-notifications.log
 
+{%- if process_inbound_email_host and process_inbound_email_user and process_inbound_email_password %}
 # Process inbound email
 */3 * * * * {{ code_dir }}/cronscripts/process-mail.py -q --log-file=DEBUG:{{ logs_dir }}/process-mail.log
+{%- endif %}
 
 {%- if mirror_prober_active %}
 # Mirror prober