Remove supervisor configuration as part of base role.

This commit is contained in:
Dorian 2016-05-14 11:10:52 -04:00
parent 0a6e8ac6c4
commit 0c1b7c293f
3 changed files with 4 additions and 19 deletions

View File

@ -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 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. 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 Example Playbook
---------------- ----------------
@ -75,7 +77,7 @@ into sections and described below:
### Virtual Environments ### 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: - virtualenv_root_path:
- Path to where the virtual environments are installed - Path to where the virtual environments are installed
@ -139,9 +141,6 @@ work with your setup:
- nginx_app_conf: - nginx_app_conf:
- The filename of the NGINX configuration for the app. - The filename of the NGINX configuration for the app.
- Default: app_name_uwsgi_nginx.conf - 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: - uwsgi_config_path:
- The path to the UWSGI configurations. - The path to the UWSGI configurations.
- Default: /srv/www/config/uwsgi - Default: /srv/www/config/uwsgi
@ -176,3 +175,4 @@ Repositories
- All development and issues are worked on this repo. - All development and issues are worked on this repo.
- Clone: https://github.com/dorianpula/ansible-nginx-uwsgi-supervisor - Clone: https://github.com/dorianpula/ansible-nginx-uwsgi-supervisor
- A clone to work with Ansible Galaxy and Github - A clone to work with Ansible Galaxy and Github
- nginx-supervisor base role: https://bitbucket.org/dorianpula/ansible-nginx-supervisor

View File

@ -4,18 +4,6 @@
supervisorctl: name={{ uwsgi_app_service_name }} state=restarted config=/etc/supervisor/supervisord.conf supervisorctl: name={{ uwsgi_app_service_name }} state=restarted config=/etc/supervisor/supervisord.conf
sudo: yes 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 - name: restart nginx
service: name=nginx state=restarted service: name=nginx state=restarted
sudo: yes sudo: yes

View File

@ -7,9 +7,6 @@ web_user: "{{ ansible_env.SUDO_USER }}"
# NGINX # NGINX
nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf" nginx_app_config: "{{ app_name }}_uwsgi_nginx.conf"
# Supervisor
supervisor_app_config: "{{ app_name }}_supervisor.conf"
# UWSGI # UWSGI
uwsgi_venv: "{{ virtualenv_root_path }}/uwsgi" uwsgi_venv: "{{ virtualenv_root_path }}/uwsgi"
uwsgi_config_path: "{{ web_root_path }}/config/uwsgi" uwsgi_config_path: "{{ web_root_path }}/config/uwsgi"