Commit 341da195 by Max Rothman

Merge pull request #1755 from edx/max/fix_notifier_defaults

Fix notifier role defaults never working
parents b95ad648 e1b915b5
...@@ -19,7 +19,7 @@ NOTIFIER_THEME_NAME: "" ...@@ -19,7 +19,7 @@ NOTIFIER_THEME_NAME: ""
NOTIFIER_THEME_REPO: "" NOTIFIER_THEME_REPO: ""
NOTIFIER_THEME_VERSION: "master" NOTIFIER_THEME_VERSION: "master"
notifier_git_ssh: "/tmp/notifier_git_ssh.sh" notifier_git_ssh: "/tmp/notifier_git_ssh.sh"
NOTIFIER_GIT_IDENTITY: !!null NOTIFIER_GIT_IDENTITY: ""
notifier_git_identity: "{{ NOTIFIER_HOME }}/notifier-git-identity" notifier_git_identity: "{{ NOTIFIER_HOME }}/notifier-git-identity"
NOTIFIER_DIGEST_EMAIL_SENDER: "notifications@example.com" NOTIFIER_DIGEST_EMAIL_SENDER: "notifications@example.com"
......
...@@ -16,19 +16,19 @@ ...@@ -16,19 +16,19 @@
template: > template: >
src=git_ssh_noauth.sh.j2 dest={{ notifier_git_ssh }} src=git_ssh_noauth.sh.j2 dest={{ notifier_git_ssh }}
owner={{ NOTIFIER_USER }} mode=750 owner={{ NOTIFIER_USER }} mode=750
when: not NOTIFIER_USE_GIT_IDENTITY when: NOTIFIER_GIT_IDENTITY == ""
- name: create ssh script for git (authenticated) - name: create ssh script for git (authenticated)
template: > template: >
src=git_ssh_auth.sh.j2 dest={{ notifier_git_ssh }} src=git_ssh_auth.sh.j2 dest={{ notifier_git_ssh }}
owner={{ NOTIFIER_USER }} mode=750 owner={{ NOTIFIER_USER }} mode=750
when: NOTIFIER_USE_GIT_IDENTITY when: NOTIFIER_GIT_IDENTITY != ""
- name: install read-only ssh key - name: install read-only ssh key
copy: > copy: >
content="{{ NOTIFIER_GIT_IDENTITY }}" dest={{ notifier_git_identity }} content="{{ NOTIFIER_GIT_IDENTITY }}" dest={{ notifier_git_identity }}
force=yes owner={{ NOTIFIER_USER }} mode=0600 force=yes owner={{ NOTIFIER_USER }} mode=0600
when: NOTIFIER_USE_GIT_IDENTITY when: NOTIFIER_GIT_IDENTITY != ""
- name: checkout theme - name: checkout theme
git: > git: >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment