cleanup.

playbooks/roles/notifier/tasks/main.yml

@@ -126,30 +126,30 @@
   - install
   - update
 
-#
+
 # TODO: Add version improvement
 #
-- name: notifier | check if dd is installed
-  command: test -e /etc/dd-agent/datadog.conf
-  register: dd_present
-  ignore_errors: yes
-  tags:
-  - notifier
-  - install
-  - update
-
-- name: notifier | install datadog agent
-  shell: bash -c "$(wget -qO- http://dtdg.co/agent-install-ubuntu)"
-  environment:
-    DD_API_KEY: "{{ notifier_dd_api_key }}"
-  when: dd_present|failed
-  tags:
-  - notifier
-  - install
-  - update
-  - ubuntu
-
-- name: common | create notifier/bin directory
+# name: notifier | check if dd is installed
+# command: test -e /etc/dd-agent/datadog.conf
+# register: dd_present
+# ignore_errors: yes
+# tags:
+# - notifier
+# - install
+# - update
+#
+# name: notifier | install datadog agent
+# shell: bash -c "$(wget -qO- http://dtdg.co/agent-install-ubuntu)"
+# environment:
+#   DD_API_KEY: "{{ notifier_dd_api_key }}"
+#  when: dd_present|failed
+#  tags:
+#  - notifier
+#  - install
+#  - update
+#  - ubuntu
+
+- name: notifier | create notifier/bin directory
   file: 
     path="{{ notifier_home }}/bin" mode=2775 state=directory
   tags:
@@ -175,18 +175,29 @@
   - install
   - update
 
-- name: notifier | add cron job
-  cron: name="forums digest" hour="0" minute="0" job="$HOME/forums_digest.sh 1440"
-  sudo: true  
-  sudo_user: "{{ notifier_user }}"
+#- name: notifier | add cron job
+#  cron: 
+#    name="forums digest" hour={{ notifier_cron_hour }} 
+#    minute="{{ notifier_cron_minute }}" job="$HOME/forums_digest.sh 1440"
+#  sudo: true  
+#  sudo_user: "{{ notifier_user }}"
+#  tags:
+#  - notifier
+#  - install
+#  - update
+
+- name: notifier | supervisord config for celery workers
+  template: 
+    src=etc/supervisor/conf.d/notifier-celery-workers.conf.j2 dest=/etc/supervisor/conf.d/notifier-celery-workers.conf 
+  notify: notifier | restart supervisor
   tags:
   - notifier
   - install
   - update
 
-- name: notifier | supervisord config for celery workers
+- name: notifier | supervisord config for celery beat
   template: 
-    src=etc/supervisor/conf.d/notifier-celery-workers.conf.j2 dest=/etc/supervisor/conf.d/notifier-celery-workers.conf 
+    src=etc/supervisor/conf.d/notifier-celery-beat.conf.j2 dest=/etc/supervisor/conf.d/notifier-celery-beat.conf 
   notify: notifier | restart supervisor
   tags:
   - notifier

playbooks/roles/notifier/vars/main.yml

@@ -12,6 +12,7 @@ notifier_git_identity_path: "{{ secure_dir }}/files/git-identity"
 notifier_requirements_file: "{{ notifier_code_dir }}/requirements.txt"
 notifier_log_level: "INFO"
 notifier_rsyslog_enabled: "yes"
+notifier_digest_task_interval: "5"
 
 notifier_env: "Development"
 
@@ -22,7 +23,6 @@ notifier_email_user: ""
 notifier_email_pass: ""
 notifier_email_host: ""
 
-
 notifier_email_domain: "notifications.edx.org"
 notifier_email_rewrite_recipient: ""
 
@@ -75,3 +75,4 @@ notifier_env_vars:
   REQUESTS_CA_BUNDLE: "{{ notifer_requests_ca_bundle }}" 
   US_HTTP_AUTH_USER: "{{ notifier_user_service_http_auth_user }}"
   US_HTTP_AUTH_PASS: "{{ notifier_user_service_http_auth_pass }}"
+  FORUM_DIGEST_TASK_INTERVAL: "{{ notifier_digest_task_interval }}"