more notifier fixes

playbooks/roles/notifier/defaults/main.yml

@@ -14,6 +14,14 @@ NOTIFIER_LOG_LEVEL: "INFO"
 NOTIFIER_RSYSLOG_ENABLED: "yes"
 NOTIFIER_DIGEST_TASK_INTERVAL: "1440"
 
+NOTIFIER_DIGEST_EMAIL_SENDER: "notifications@example.com"
+NOTIFIER_DIGEST_EMAIL_SUBJECT: "Daily Discussion Digest"
+NOTIFIER_DIGEST_EMAIL_TITLE: "Discussion Digest"
+NOTIFIER_DIGEST_EMAIL_DESCRIPTION: "A digest of unread content from course discussions you are following."
+NOTIFIER_EMAIL_SENDER_POSTAL_ADDRESS: ""
+
+NOTIFIER_LANGUAGE: ""
+
 NOTIFIER_ENV: "Development"
 
 NOTIFIER_EMAIL_BACKEND: "console"
@@ -23,15 +31,8 @@ NOTIFIER_EMAIL_USER: ""
 NOTIFIER_EMAIL_PASS: ""
 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"
 
@@ -40,8 +41,8 @@ NOTIFIER_COMMENT_SERVICE_API_KEY: "PUT_YOUR_API_KEY_HERE"
 
 NOTIFIER_USER_SERVICE_BASE: "http://localhost:8000"
 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_USER_SERVICE_HTTP_AUTH_USER: !!null
+NOTIFIER_USER_SERVICE_HTTP_AUTH_PASS: !!null
 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"
@@ -67,6 +68,12 @@ notifier_debian_pkgs:
 # the env variable for the supervisor job definition.
 #
 notifier_env_vars:
+  FORUM_DIGEST_EMAIL_SENDER: $NOTIFIER_DIGEST_EMAIL_SENDER
+  FORUM_DIGEST_EMAIL_SUBJECT: $NOTIFIER_DIGEST_EMAIL_SUBJECT
+  FORUM_DIGEST_EMAIL_TITLE: $NOTIFIER_DIGEST_EMAIL_TITLE
+  FORUM_DIGEST_EMAIL_DESCRIPTION: $NOTIFIER_DIGEST_EMAIL_DESCRIPTION
+  EMAIL_SENDER_POSTAL_ADDRESS: $NOTIFIER_EMAIL_SENDER_POSTAL_ADDRESS
+  NOTIFIER_LANGUAGE: $NOTIFIER_LANGUAGE
   NOTIFIER_ENV: $NOTIFIER_ENV
   NOTIFIER_DB_DIR: $NOTIFIER_DB_DIR
   EMAIL_BACKEND: $NOTIFIER_EMAIL_BACKEND
@@ -75,7 +82,6 @@ notifier_env_vars:
   EMAIL_HOST_USER: $NOTIFIER_EMAIL_USER
   EMAIL_HOST_PASSWORD: $NOTIFIER_EMAIL_PASS
   EMAIL_USE_TLS: $NOTIFIER_EMAIL_USE_TLS
-  EMAIL_DOMAIN: $NOTIFIER_EMAIL_DOMAIN
   EMAIL_REWRITE_RECIPIENT: $NOTIFIER_EMAIL_REWRITE_RECIPIENT
   LMS_URL_BASE: $NOTIFIER_LMS_URL_BASE
   SECRET_KEY: $NOTIFIER_LMS_SECRET_KEY
@@ -92,8 +98,3 @@ notifier_env_vars:
   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

@@ -30,21 +30,21 @@
   tags:
   - deploy
 
-- name: notifier | syncdb
+- name: notifier | fix permissions on notifer db file
   shell: >
-    cd {{ NOTIFIER_CODE_DIR }} && {{ NOTIFIER_VENV_DIR }}/bin/python manage.py syncdb
-  sudo: true  
-  sudo_user: "{{ NOTIFIER_USER }}"
+    chmod 0664 {{ NOTIFIER_DB_DIR }}/*
+  sudo: true
   notify:
     - notifier | restart notifier-scheduler
     - notifier | restart notifier-celery-workers
   tags:
   - deploy
 
-- name: notifier | fix permissions on notifer db file
+- name: notifier | syncdb
   shell: >
-    chmod 0664 {{ NOTIFIER_DB_DIR }}/*
-  sudo: true
+    cd {{ NOTIFIER_CODE_DIR }} && {{ NOTIFIER_VENV_DIR }}/bin/python manage.py syncdb
+  sudo: true  
+  sudo_user: "{{ NOTIFIER_USER }}"
   notify:
     - notifier | restart notifier-scheduler
     - notifier | restart notifier-celery-workers

playbooks/roles/notifier/tasks/main.yml

@@ -47,7 +47,6 @@
   user:
     name={{ NOTIFIER_USER }} state=present shell=/bin/bash
     home={{ NOTIFIER_HOME }} createhome=yes
-  ignore_errors: true
 
 - name: notifier | setup the notifier env
   template:
@@ -84,7 +83,7 @@
 
 - name: notifier | create notifier/bin directory
   file:
-    path="{{ NOTIFIER_HOME }}/bin" mode=2775 state=directory owner={{ NOTIFIER_USER }} group={{ NOTIFIER_WEB_USER }}
+    path="{{ NOTIFIER_HOME }}/bin" mode=2775 state=directory owner={{ NOTIFIER_USER }} group={{ NOTIFIER_USER }}
 
 - name: notifier | supervisord config for celery workers
   template: >
@@ -100,4 +99,4 @@
   sudo_user: "{{ supervisor_user }}"
   notify: notifier | restart notifier-scheduler
 
-- include: deploy.yml
\ No newline at end of file
+- include: deploy.yml