From 0c1b7c293f8e01fb09bc543ec32e0035d3b0e3f8 Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Sat, 14 May 2016 11:10:52 -0400
Subject: [PATCH] Remove supervisor configuration as part of base role.

---
 README.md         |  8 ++++----
 handlers/main.yml | 12 ------------
 vars/main.yml     |  3 ---
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 982523b..365e605 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ Requirements
 This role is designed to work against a modern Ubuntu system.  (Tested on Ubuntu 13.10 and 14.04)  It should 
 theoretically work on older versions of Ubuntu or Debian based systems.
 
+This role relies on the [nginx-supervisor base role](https://bitbucket.org/dorianpula/ansible-nginx-supervisor).
+
 Example Playbook
 ----------------
 
@@ -75,7 +77,7 @@ into sections and described below:
     
 ### Virtual Environments
 
-**NEW** - On occassion it is necessary to change the setup of the virtual environments on a system.
+On occasion it is necessary to change the setup of the virtual environments on a system.
 
 - virtualenv_root_path: 
     - Path to where the virtual environments are installed
@@ -139,9 +141,6 @@ work with your setup:
 - nginx_app_conf: 
     - The filename of the NGINX configuration for the app.
     - Default: app_name_uwsgi_nginx.conf
-- supervisor_app_config:
-    - The filename of the supervisor configuration for the app.  
-    - Default: app_name_supervisor.conf
 - uwsgi_config_path: 
     - The path to the UWSGI configurations.
     - Default: /srv/www/config/uwsgi
@@ -176,3 +175,4 @@ Repositories
     - All development and issues are worked on this repo.
 - Clone: https://github.com/dorianpula/ansible-nginx-uwsgi-supervisor
     - A clone to work with Ansible Galaxy and Github
+- nginx-supervisor base role: https://bitbucket.org/dorianpula/ansible-nginx-supervisor
diff --git a/handlers/main.yml b/handlers/main.yml
index c06bb10..ae30b4b 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,18 +4,6 @@
   supervisorctl: name={{ uwsgi_app_service_name }} state=restarted config=/etc/supervisor/supervisord.conf
   sudo: yes
 
-- name: start supervisord
-  service: name=supervisor state=started
-  sudo: yes
-
-- name: start supervisord
-  service: name=supervisor state=started
-  sudo: yes
-
-- name: restart supervisord
-  service: name=supervisor state=restarted
-  sudo: yes
-
 - name: restart nginx
   service: name=nginx state=restarted
   sudo: yes
diff --git a/vars/main.yml b/vars/main.yml
index 8f60a11..3f7eb46 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -7,9 +7,6 @@ web_user: "{{ ansible_env.SUDO_USER }}"
 # NGINX
 nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf"
 
-# Supervisor
-supervisor_app_config: "{{ app_name }}_supervisor.conf"
-
 # UWSGI
 uwsgi_venv: "{{ virtualenv_root_path }}/uwsgi"
 uwsgi_config_path: "{{ web_root_path }}/config/uwsgi"