Fix xserver upstart template issues.

playbooks/roles/xserver/tasks/main.yml

@@ -14,7 +14,7 @@
   command: /usr/local/bin/virtualenv {{ xserver_sandbox_venv_dir }} --distribute creates={{ xserver_sandbox_venv_dir }}/bin/activate
 
 - name: set sandbox sudoers settings
-  copy: src=sandbox.sudoers dest=/etc/sudoers.d/99-sandbox mode=0440
+  copy: src=sandbox.sudoers dest=/etc/sudoers.d/99-sandbox mode=0440 owner=root group=root
 
 # Make sure this line is in the common-session file.
 - name: ensure pam-limits module is loaded
@@ -42,7 +42,7 @@
   command: aa-enforce {{ xserver_sandbox_venv_dir }}
 
 - name: setup upstart script
-  template: src=xserver.conf.j2 dest=/etc/init/xserver_conf owner=root group=root
+  template: src=xserver.conf.j2 dest=/etc/init/xserver.conf owner=root group=root
 
 - name: install system dependencies of xserver
   apt: pkg={{ item }} state=present

playbooks/roles/xserver/templates/xserver.conf.j2

@@ -19,7 +19,7 @@ env DJANGO_SETTINGS_MODULE=xserver_aws_settings
 env SERVICE_VARIANT="xserver"
 
 
-chdir /opt/wwc/xserver
+chdir {{ xserver_code_dir }}
 setuid www-data
 
 exec {{ venv_dir }}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=30 --pythonpath={{ xserver_code_dir }} pyxserver_wsgi:application