From 7dfbaf85e5d7d1042549de5d0a2b8a66592e2005 Mon Sep 17 00:00:00 2001 From: Dorian Pula Date: Tue, 17 May 2016 23:41:02 -0400 Subject: [PATCH] Make sure role works with latest revision of base roles. --- meta/main.yml | 16 ++++++++-------- vars/main.yml | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 5aef8c5..26ec119 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -15,14 +15,14 @@ galaxy_info: - web dependencies: # - role: "git+https://bitbucket.org/dorianpula/ansible-nginx-uwsgi-supervisor,,nginx-uwsgi-supervisor" - - role: "nginx-uwsgi-supervisor" - app_name: "{{ rookeries_app_name }}" - app_root_path: "{{ rookeries_app_symlink }}" - app_venv: "{{ rookeries_venv_symlink }}" - app_nginx_hostname: "{{ rookeries_app_hostname }}" - app_uwsgi_port: "{{ rookeries_local_uwsgi_port }}" - app_uwsgi_executable: "rookeries:make_rookeries_app()" - app_uwsgi_envs: "{{ rookeries_app_config }}" + - role: "uwsgi-nginx-supervisor" + uwsgi_app_name: "{{ rookeries_app_name }}" + uwsgi_app_root_path: "{{ rookeries_app_symlink }}" + uwsgi_app_venv: "{{ rookeries_venv_symlink }}" + uwsgi_app_nginx_hostname: "{{ rookeries_app_hostname }}" + uwsgi_app_port: "{{ rookeries_local_uwsgi_port }}" + uwsgi_app_executable: "rookeries:make_rookeries_app()" + uwsgi_app_envs: "{{ rookeries_app_config }}" # - role: "git+https://bitbucket.org/dorianpula/ansible-nodejs,,nodejs" - role: "nodejs" node_version_family: "5.x" diff --git a/vars/main.yml b/vars/main.yml index 3ea06d3..0e3db37 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,6 +1,9 @@ --- # App name reused from the nginx-uwsgi-supervisor roles 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