supervisor-xserver: Move playbooks to supervisorctl and supervisor.conf

playbooks/roles/xserver/tasks/deploy.yml

 - name: xserver | stop xserver
-  service: name=xserver state=stopped
+  supervisorctl: >
+    name=xserver
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=stopped
   tags:
   - deploy
 
@@ -9,6 +13,18 @@
   tags:
   - deploy
 
+- name: "xserver | writing supervisor script"
+  template: >
+    src=xserver.conf.j2 dest={{ supervisor_cfg_dir }}/xserver.conf
+    owner={{ supervisor_user }} group={{ common_web_user }} mode=0644
+  tags:
+  - deploy
+
+- name: xserver | reload supervisor to allow to start the new services
+  shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} reload"
+  tags:
+  - deploy
+
 - name: xserver | install requirements
   pip: requirements="{{xserver_requirements_file}}" virtualenv="{{ xserver_venv_dir }}" state=present
   sudo_user: "{{ xserver_user }}"
@@ -55,6 +71,10 @@
   - deploy
 
 - name: xserver | start xserver
-  service: name=xserver state=started
+  supervisorctl: >
+    name=xserver
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=started
   tags:
   - deploy

playbooks/roles/xserver/tasks/main.yml

@@ -24,7 +24,6 @@
     createhome=no
     shell=/bin/false
 
-
 - name: xserver | create xserver app and data dirs
   file: >
     path="{{ item }}"
@@ -63,9 +62,6 @@
   - "{{ secure_dir }}/files/edx_apparmor_sandbox.j2"
   - "usr.bin.python-sandbox.j2"
 
-- name: xserver | setup upstart script
-  template: src=xserver.conf.j2 dest=/etc/init/xserver.conf owner=root group=root
-
 - include: deploy.yml
 
 - name: xserver | enforce app-armor rules