notifier fixes

playbooks/edx-west/prod-worker.yml

@@ -51,8 +51,8 @@
     - datadog
     #- splunkforwarder
 
-# run the certificate agent on the first util machine only
-- hosts: ~tag_Name_util1_prod
+- name: run the certificate agent on the first util machine only
+  hosts: ~tag_Name_util1_prod
   sudo: True
   vars:
     secure_dir: '../../../configuration-secure/ansible'
@@ -63,25 +63,20 @@
     - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
     - "{{ secure_dir }}/vars/certs_prod_vars.yml"
   roles:
-    - role: gh_users # gh_users var intentionally unspecified
-      tags: users
     - role: certs
       tags: certs
 
-# run the notifier on the first util machine only
-#- hosts: ~tag_Name_util1_prod
-#  sudo: True
-#  vars:
-#    secure_dir: '../../../configuration-secure/ansible'
-#    migrate_db: "no"
-#  vars_files:
-#    - "roles/common/defaults/main.yml"
-#    - "roles/supervisor/defaults/main.yml"
-#    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-#    - "{{ secure_dir }}/vars/notifier_prod_vars.yml"
-#  roles:
-#    - role: virtualenv
-#      virtualenv_user: "notifier"
-#      virtualenv_user_home: "/opt/wwc/notifier"
-#      virtualenv_name: "notifier"
-#    - notifier
+- name: run the notifier on the second util machine only
+  hosts: ~tag_Name_util2_prod
+  sudo: True
+  vars:
+    secure_dir: "../../../configuration-secure/ansible"
+    local_dir: "{{secure_dir}}/local"
+    migrate_db: "no"
+  vars_files:
+    - "roles/common/defaults/main.yml"
+    - "roles/supervisor/defaults/main.yml"
+    - "{{ secure_dir }}/vars/notifier_prod_vars.yml"
+  roles:
+    - role: notifier
+      tags: notifier

playbooks/roles/apache/tasks/main.yml

@@ -28,6 +28,7 @@
 - name: apache | Register the fact that apache role has run
   command: echo True
   register: apache_role_run
+  notify: apache | restart apache
   tags:
     - apache
     - install

playbooks/roles/notifier/defaults/main.yml

 ---
 
 NOTIFIER_USER: "notifier"
-NOTIFIER_WEB_USER: "www-user"
+NOTIFIER_WEB_USER: "www-data"
 NOTIFIER_HOME: "{{ COMMON_APP_DIR }}/notifier"
 NOTIFIER_VENV_DIR: "{{ NOTIFIER_HOME }}/virtualenvs/notifier"
 NOTIFIER_DB_DIR: "{{ NOTIFIER_HOME }}/db"
@@ -26,6 +26,12 @@ NOTIFIER_EMAIL_USE_TLS: "False"
 NOTIFIER_EMAIL_DOMAIN: "notifications.edx.org"
 NOTIFIER_EMAIL_REWRITE_RECIPIENT: ""
 
+NOTIFIER_FORUM_DIGEST_EMAIL_SENDER: "notifications@example.org"
+NOTIFIER_FORUM_DIGEST_EMAIL_SUBJECT: "Daily Discussion Digest"
+NOTIFIER_FORUM_DIGEST_EMAIL_TITLE: "Discussion Digest"
+NOTIFIER_FORUM_DIGEST_EMAIL_DESCRIPTION: "A digest of unread content from course discussions you are following."
+NOTIFIER_EMAIL_SENDER_POSTAL_ADDRESS: "Cambridge, MA"
+
 NOTIFIER_LMS_URL_BASE: "http://localhost:8000"
 NOTIFIER_LMS_SECRET_KEY: "PUT_YOUR_SECRET_KEY_HERE"
 
@@ -37,7 +43,7 @@ NOTIFIER_USER_SERVICE_API_KEY: "PUT_YOUR_API_KEY_HERE"
 NOTIFIER_USER_SERVICE_HTTP_AUTH_USER: "guido"
 NOTIFIER_USER_SERVICE_HTTP_AUTH_PASS: "vanrossum"
 NOTIFIER_CELERY_BROKER_URL: "django://"
-
+NOTIFIER_LOGO_IMAGE_URL: "{{ NOTIFIER_LMS_URL_BASE }}/static/images/header-logo.png"
 NOTIFIER_SUPERVISOR_LOG_DEST: "{{ COMMON_DATA_DIR }}/log/supervisor"
 
 NOTIFER_REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt"
@@ -85,3 +91,9 @@ notifier_env_vars:
   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
+  LOGO_IMAGE_URL: $NOTIFIER_LOGO_IMAGE_URL
+  FORUM_DIGEST_EMAIL_SENDER: $NOTIFIER_FORUM_DIGEST_EMAIL_SENDER
+  FORUM_DIGEST_EMAIL_SUBJECT: $NOTIFIER_FORUM_DIGEST_EMAIL_SUBJECT
+  FORUM_DIGEST_EMAIL_TITLE: $NOTIFIER_FORUM_DIGEST_EMAIL_TITLE
+  FORUM_DIGEST_EMAIL_DESCRIPTION: $NOTIFIER_FORUM_DIGEST_EMAIL_TITLE
+  EMAIL_SENDER_POSTAL_ADDRESS: $NOTIFIER_FORUM_DIGEST_EMAIL_TITLE

playbooks/roles/notifier/tasks/deploy.yml

@@ -40,3 +40,13 @@
     - notifier | restart notifier-celery-workers
   tags:
   - deploy
+
+- name: notifier | fix permissions on notifer db file
+  shell: >
+    chmod 0664 {{ NOTIFIER_DB_DIR }}/*
+  sudo: true
+  notify:
+    - notifier | restart notifier-scheduler
+    - notifier | restart notifier-celery-workers
+  tags:
+  - deploy

playbooks/roles/notifier/tasks/main.yml

@@ -47,6 +47,7 @@
   user:
     name={{ NOTIFIER_USER }} state=present shell=/bin/bash
     home={{ NOTIFIER_HOME }} createhome=yes
+  ignore_errors: true
 
 - name: notifier | setup the notifier env
   template:
@@ -79,11 +80,11 @@
 
 - name: notifier | create notifier DB directory
   file:
-    path="{{ NOTIFIER_DB_DIR }}" mode=2775 state=directory
+    path="{{ NOTIFIER_DB_DIR }}" mode=2775 state=directory owner={{ NOTIFIER_USER }} group={{ NOTIFIER_WEB_USER }}
 
 - name: notifier | create notifier/bin directory
   file:
-    path="{{ NOTIFIER_HOME }}/bin" mode=2775 state=directory
+    path="{{ NOTIFIER_HOME }}/bin" mode=2775 state=directory owner={{ NOTIFIER_USER }} group={{ NOTIFIER_WEB_USER }}
 
 - name: notifier | supervisord config for celery workers
   template: >