Merge pull request #1520 from edx/derf/notifier_theme_support

add theme support for notifier role, simply notifier enviornment config

playbooks/roles/notifier/defaults/main.yml

@@ -13,6 +13,10 @@ NOTIFIER_LOG_LEVEL: "INFO"
 NOTIFIER_RSYSLOG_ENABLED: "yes"
 NOTIFIER_DIGEST_TASK_INTERVAL: "1440"
 
+NOTIFIER_THEME_NAME: ""
+NOTIFIER_THEME_REPO: ""
+NOTIFIER_THEME_VERSION: "master"
+
 NOTIFIER_DIGEST_EMAIL_SENDER: "notifications@example.com"
 NOTIFIER_DIGEST_EMAIL_SUBJECT: "Daily Discussion Digest"
 NOTIFIER_DIGEST_EMAIL_TITLE: "Discussion Digest"

playbooks/roles/notifier/tasks/deploy.yml

@@ -11,6 +11,25 @@
     - restart notifier-scheduler
     - restart notifier-celery-workers
 
+- name: checkout theme
+  git: >
+    dest={{ NOTIFIER_CODE_DIR }}/{{NOTIFIER_THEME_NAME}}
+    repo={{NOTIFIER_THEME_REPO}}
+    version={{NOTIFIER_THEME_VERSION}}
+    accept_hostkey=yes
+  when: NOTIFIER_THEME_NAME != ''
+  sudo_user: "{{ NOTIFIER_USER }}"
+  environment:
+    GIT_SSH: "{{ NOTIFIER_GIT_SSH }}"
+
+- name: write notifier local settings
+  template: >
+    src=settings_local.py.j2
+    dest={{ NOTIFIER_CODE_DIR }}/settings_local.py
+  when: NOTIFIER_THEME_NAME != ''
+  notify:
+    - restart notifier-celery-workers
+
 - name: source repo group perms
   file:
     path={{ NOTIFIER_SOURCE_REPO }} mode=2775 state=directory

playbooks/roles/notifier/tasks/main.yml

@@ -85,6 +85,18 @@
   file:
     path="{{ NOTIFIER_HOME }}/bin" mode=2775 state=directory owner={{ NOTIFIER_USER }} group={{ NOTIFIER_USER }}
 
+- name: write supervisord wrapper for celery workers
+  template: >
+    src=notifier-celery-workers-supervisor.sh.j2
+    dest="{{ NOTIFIER_HOME }}/notifier-celery-workers-supervisor.sh"
+  sudo_user: "{{ supervisor_user }}"
+
+- name: write supervisord wrapper for scheduler
+  template: >
+    src=notifier-scheduler-supervisor.sh.j2
+    dest="{{ supervisor_available_dir }}/notifier-scheduler-supervisor.sh"
+  sudo_user: "{{ supervisor_user }}"
+
 - name: write supervisord config for celery workers
   template: >
     src=edx/app/supervisor/conf.d/notifier-celery-workers.conf.j2

playbooks/roles/notifier/templates/edx/app/supervisor/conf.d/notifier-celery-workers.conf.j2

@@ -3,7 +3,7 @@
 ;
 [program:notifier-celery-workers]
 
-command={{ NOTIFIER_VENV_DIR }}/bin/python manage.py celery worker -l {{ NOTIFIER_LOG_LEVEL }}
+command={{ NOTIFIER_HOME }}/notifier-celery-workers-supervisor.sh
 
 process_name=%(program_name)s
 numprocs=1
@@ -25,8 +25,3 @@ stderr_logfile={{ NOTIFIER_SUPERVISOR_LOG_DEST }}/notifier-celery-workers-stderr
 stderr_logfile_maxbytes=1MB
 stderr_logfile_backups=10
 stderr_capture_maxbytes=1MB
-environment=PID='/var/tmp/notifier-celery-workers.pid',LANG=en_US.UTF-8,
-{%- do notifier_env_vars.update(NOTIFIER_ENV_EXTRA) -%}
-{%- for name,value in notifier_env_vars.items() -%}
-{%- if value -%}{{name}}="{{value}}"{%- if not loop.last -%},{%- endif -%}{%- endif -%}
-{%- endfor -%}

playbooks/roles/notifier/templates/edx/app/supervisor/conf.d/notifier-scheduler.conf.j2

@@ -3,7 +3,7 @@
 ;
 [program:notifier-scheduler]
 
-command={{ NOTIFIER_VENV_DIR }}/bin/python manage.py scheduler
+command={{ NOTIFIER_HOME }}/notifier-scheduler-supervisor.sh
 
 process_name=%(program_name)s
 numprocs=1
@@ -25,8 +25,3 @@ stderr_logfile={{ NOTIFIER_SUPERVISOR_LOG_DEST }}/notifier-scheduler-stderr.log
 stderr_logfile_maxbytes=1MB
 stderr_logfile_backups=10
 stderr_capture_maxbytes=1MB
-environment=PID='/var/tmp/notifier-scheduler.pid',LANG=en_US.UTF-8,
-{%- do notifier_env_vars.update(NOTIFIER_ENV_EXTRA) -%}
-{%- for name,value in notifier_env_vars.items() -%}
-{%- if value -%}{{name}}="{{value}}"{%- if not loop.last -%},{%- endif -%}{%- endif -%}
-{%- endfor -%}

playbooks/roles/notifier/templates/notifier-celery-workers-supervisor.sh.j2

+#!/bin/bash
+
+source {{ NOTIFIER_HOME }}/notifier_env
+cd {{ NOTIFIER_CODE_DIR }}
+
+export PID='/var/tmp/notifier-scheduler.pid'
+export LANG=en_US.UTF-8
+
+{{ NOTIFIER_VENV_DIR }}/bin/python manage.py celery worker -l {{ NOTIFIER_LOG_LEVEL }}
+

playbooks/roles/notifier/templates/notifier-scheduler-supervisor.sh.j2

+#!/bin/bash
+
+source {{ NOTIFIER_HOME }}/notifier_env
+cd {{ NOTIFIER_CODE_DIR }}
+
+export PID='/var/tmp/notifier-celery-workers.pid'
+export LANG=en_US.UTF-8
+
+{{ NOTIFIER_VENV_DIR }}/bin/python manage.py scheduler
+

playbooks/roles/notifier/templates/notifier_env.j2

@@ -6,3 +6,6 @@
 export {{ name }}="{{ value }}"
 {% endif %}		 
 {% endfor %}
+{% if NOTIFIER_THEME_NAME != "" %}
+export DJANGO_SETTINGS_MODULE=notifier.settings_local
+{% endif %}

playbooks/roles/notifier/templates/settings_local.py

+from .settings import *
+
+FORUM_DIGEST_EMAIL_SUBJECT = '{{ NOTIFIER_DIGEST_EMAIL_SUBJECT  }}'
+
+CUSTOM_THEME_DIR = '{{ NOTIFIER_CODE_DIR }}/{{NOTIFIER_THEME_NAME}}/'
+TEMPLATE_DIRS = (CUSTOM_THEME_DIR + 'templates',)