Make sure role works with latest revision of base roles.

This commit is contained in:
Dorian 2016-05-17 23:41:02 -04:00
parent 22870d8016
commit 7dfbaf85e5
2 changed files with 11 additions and 8 deletions

View File

@ -15,14 +15,14 @@ galaxy_info:
- web - web
dependencies: dependencies:
# - role: "git+https://bitbucket.org/dorianpula/ansible-nginx-uwsgi-supervisor,,nginx-uwsgi-supervisor" # - role: "git+https://bitbucket.org/dorianpula/ansible-nginx-uwsgi-supervisor,,nginx-uwsgi-supervisor"
- role: "nginx-uwsgi-supervisor" - role: "uwsgi-nginx-supervisor"
app_name: "{{ rookeries_app_name }}" uwsgi_app_name: "{{ rookeries_app_name }}"
app_root_path: "{{ rookeries_app_symlink }}" uwsgi_app_root_path: "{{ rookeries_app_symlink }}"
app_venv: "{{ rookeries_venv_symlink }}" uwsgi_app_venv: "{{ rookeries_venv_symlink }}"
app_nginx_hostname: "{{ rookeries_app_hostname }}" uwsgi_app_nginx_hostname: "{{ rookeries_app_hostname }}"
app_uwsgi_port: "{{ rookeries_local_uwsgi_port }}" uwsgi_app_port: "{{ rookeries_local_uwsgi_port }}"
app_uwsgi_executable: "rookeries:make_rookeries_app()" uwsgi_app_executable: "rookeries:make_rookeries_app()"
app_uwsgi_envs: "{{ rookeries_app_config }}" uwsgi_app_envs: "{{ rookeries_app_config }}"
# - role: "git+https://bitbucket.org/dorianpula/ansible-nodejs,,nodejs" # - role: "git+https://bitbucket.org/dorianpula/ansible-nodejs,,nodejs"
- role: "nodejs" - role: "nodejs"
node_version_family: "5.x" node_version_family: "5.x"

View File

@ -1,6 +1,9 @@
--- ---
# App name reused from the nginx-uwsgi-supervisor roles # App name reused from the nginx-uwsgi-supervisor roles
app_name: "{{ rookeries_app_name }}" app_name: "{{ rookeries_app_name }}"
web_root_path: /srv/www
virtualenv_root_path: "{{ web_root_path }}/virtualenvs"
web_server_group: www-data
# Introduced from deployment playbook # Introduced from deployment playbook