Merge pull request #68 from ellisonbg/master

Minor fixes to recent work
jupyterhub · Jan 11, 2017 · b22df9e · b22df9e
2 parents 78c52fe + 385a7b5
commit b22df9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/roles/jupyterhub/templates/jupyterhub_config.py.j2 b/roles/jupyterhub/templates/jupyterhub_config.py.j2
@@ -13,17 +13,17 @@ c.JupyterHub.cleanup_proxy = False
 c.JupyterHub.cleanup_servers = False
 {% endif %}
 
-c.JupyterHub.load_groups = [
+c.JupyterHub.load_groups = {
 {% if use_nbgrader -%}
 {%- for course in nbgrader_courses -%}
     'formgrade-{{course.course_id}}': [
 {%- for grader in course.graders -%}
         '{{grader}}',
-{%- endfor %}
-    ]
+{%- endfor -%}
+    ],
 {% endfor -%}
 {%- endif %}
-]
+}
 
 {% if use_oauth %}
 c.JupyterHub.authenticator_class = u'oauthenticator.LocalGitHubOAuthenticator'
@@ -56,21 +56,21 @@ c.Authenticator.whitelist = set()
 
 c.JupyterHub.services = [
 {% if use_nbgrader %}
-{%- for course in nbgrader_courses -%}
+{%- for course in nbgrader_courses %}
     {
         'name': 'formgrade-{{course.course_id}}',
         'admin': True,
         'url': 'http://127.0.0.1:{{course.port}}',
-		'user': {{course.owner}},
-		'cwd': '{{home_dir}}/{{course.owner}}/nbgrader/{{course.course_id}}'
+        'user': '{{course.owner}}',
+        'cwd': '{{home_dir}}/{{course.owner}}/nbgrader/{{course.course_id}}'
     },
 {% endfor -%}
 {% endif %}
-{% if use_cull_idle_servers and cull_idle_servers_hubapi_token %}
+{% if use_cull_idle_servers %}
     {
         'name': 'cull_idle_servers',
         'admin': True,
-		'command': ['/opt/conda/bin/python3', '{{jupyterhub_srv_dir}}/cull_idle_servers.py', '--cull-every={{cull_every}}', '--timeout={{cull_timeout}}']
+        'command': ['/opt/conda/bin/python3', '{{jupyterhub_srv_dir}}/cull_idle_servers.py', '--cull-every={{cull_every}}', '--timeout={{cull_timeout}}']
 	},
 {% endif %}
 ]
diff --git a/roles/nbgrader/tasks/main.yml b/roles/nbgrader/tasks/main.yml
@@ -59,7 +59,7 @@
     - ['source', 'release', 'feedback', 'autograded', 'submitted']
 
 - name: install nbgrader config file
-  template: src=nbgrader_config.py.j2 dest={{home_dir}}/{{item.owner}}/nbgrader/{{item.course_id}}/nbgrader_config.py owner={{item.owner}} group={{item[0].owner}} mode=700
+  template: src=nbgrader_config.py.j2 dest={{home_dir}}/{{item.owner}}/nbgrader/{{item.course_id}}/nbgrader_config.py owner={{item.owner}} group={{item.owner}} mode=700
   become: true
   with_items:
     - "{{nbgrader_courses}}"

diff --git a/roles/nbgrader/templates/nbgrader_config.py.j2 b/roles/nbgrader/templates/nbgrader_config.py.j2
@@ -6,4 +6,4 @@ c.NbGrader.course_id = '{{item.course_id}}'
 
 c.FormgradeApp.authenticator_class = u'nbgrader.auth.hubauth.HubAuth'
 c.FormgradeApp.port = {{item.port}}
-c.HubAuth.grader_group = u'formgrade-{{item.grader_group}}'
+c.HubAuth.grader_group = u'formgrade-{{item.course_id}}'