new config file

playbooks/roles/xqwatcher/defaults/main.yml

@@ -10,6 +10,11 @@
 ##
 # Defaults for role xqwatcher
 #
+
+XQWATCHER_CONFIG:
+  HTTP_BASIC_AUTH: ['foo','bar']
+  POLL_TIME: 10
+
 XQWATCHER_COURSES:
   - COURSE: "exampleX-101x"
     GIT_REPO: "git@github.com:foo/graders-exampleX-101x.git"
@@ -63,7 +68,7 @@ xqwatcher_home: "{{ COMMON_APP_DIR }}/{{ xqwatcher_service_name }}"
 xqwatcher_venv_base: "{{ xqwatcher_home }}/venvs"
 xqwatcher_venv_dir: "{{ xqwatcher_venv_base }}/{{ xqwatcher_service_name }}"
 xqwatcher_code_dir: "{{ xqwatcher_app_dir }}/src"
-xqwatcher_conf_dir: "{{ xqwatcher_home }}/conf.d"
+xqwatcher_conf_dir: "{{ xqwatcher_home }}"
 xqwatcher_data_dir: "{{ xqwatcher_home }}/data"
 
 xqwatcher_source_repo: "git@{{ COMMON_GIT_MIRROR }}:edx/xqueue-watcher.git"

playbooks/roles/xqwatcher/tasks/main.yml

@@ -103,10 +103,16 @@
     - "{{ xqwatcher_supervisor_data_dir }}"
     - "{{ xqwatcher_supervisor_log_dir }}"
 
+- name: write out watcher config file
+  template: >
+    src=edx/app/xqwatcher/xqwatcher.json.j2
+    dest={{ xqwatcher_conf_dir }}/xqwatcher.json
+    mode=0644 owner={{ xqwatcher_user }} group={{ xqwatcher_user }}
+
 - name: write out course config files
   template: >
     src=edx/app/xqwatcher/conf.d/course.json.j2
-    dest={{ xqwatcher_conf_dir }}/{{ item.COURSE }}.json
+    dest={{ xqwatcher_conf_dir }}/conf.d/{{ item.COURSE }}.json
     mode=0644 owner={{ xqwatcher_user }} group={{ xqwatcher_user }}
   with_items: XQWATCHER_COURSES
 

playbooks/roles/xqwatcher/templates/edx/app/xqwatcher/xqwatcher.json.j2

+{{ XQWATCHER_CONFIG | to_nice_json }}
\ No newline at end of file