Merge pull request #69 from ellisonbg/nbgrader-command

Fix file things related to jupyterhub and nbgrader
jupyterhub · Jan 14, 2017 · a34abde · a34abde
2 parents b22df9e + 1faf657
commit a34abde
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/deploy.yml b/deploy.yml
@@ -37,5 +37,6 @@
       when: use_cull_idle_servers is defined and use_cull_idle_servers
     - role: nbgrader
       when: use_nbgrader is defined and use_nbgrader
+    - role: start_jupyterhub
   environment:
       PATH: "/opt/conda/bin:{{ default_path.stdout }}"
diff --git a/roles/jupyterhub/tasks/supervisor.yml b/roles/jupyterhub/tasks/supervisor.yml
@@ -7,9 +7,3 @@
 - name: install jupyterhub launch script
   template: src=start-jupyterhub.sh.j2 dest={{jupyterhub_srv_dir}}/start-jupyterhub.sh mode=0700
   become: true
-
-- name: load jupyterhub supervisor config
-  supervisorctl: name=jupyterhub state=present
-
-- name: restart jupyterhub with supervisor
-  supervisorctl: name=jupyterhub state=restarted
diff --git a/roles/jupyterhub/templates/jupyterhub_config.py.j2 b/roles/jupyterhub/templates/jupyterhub_config.py.j2
@@ -62,7 +62,8 @@ c.JupyterHub.services = [
         'admin': True,
         'url': 'http://127.0.0.1:{{course.port}}',
         'user': '{{course.owner}}',
-        'cwd': '{{home_dir}}/{{course.owner}}/nbgrader/{{course.course_id}}'
+        'cwd': '{{home_dir}}/{{course.owner}}/nbgrader/{{course.course_id}}',
+		'command': ['nbgrader', 'formgrade']
     },
 {% endfor -%}
 {% endif %}

diff --git a/roles/start_jupyterhub/tasks/main.yml b/roles/start_jupyterhub/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+
+- name: load jupyterhub supervisor config
+  supervisorctl: name=jupyterhub state=present
+
+- name: restart jupyterhub with supervisor
+  supervisorctl: name=jupyterhub state=restarted