dorian
/
ansible-nginx-uwsgi-supervisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split out default variables from the internal role variables derived from the defaults.

This commit is contained in:
Dorian 2015-01-14 08:10:04 -05:00
parent 771c6bac2d
commit ddf16090ac
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
defaults/main.yml
View File

@ -1,2 +1,16 @@
--- ---
# defaults file for ansible-nginx-uwsgi-supervisor # defaults file for ansible-nginx-uwsgi-supervisor
# Web root paths + app name + home
app_name: rookeries
web_root_path: /srv/www
web_server_group: www-data
app_home: "{{ web_root_path }}/{{ app_name }}_webapp"
# NGINX
nginx_hostname: localhost
nginx_app_static: "{{ app_home }}/{{ app_name }}/static/"
# UWSGI
uwsgi_port: 8001
uwsgi_app_executable: rookeries:make_rookeries_app()

8
vars/main.yml
View File

@ -2,11 +2,7 @@
# vars file for ansible-nginx-uwsgi-supervisor # vars file for ansible-nginx-uwsgi-supervisor
# Web root paths + app name + home # Web root paths + app name + home
app_name: rookeries
web_root_path: /srv/www
web_server_group: www-data
web_user: "{{ ansible_env.SUDO_USER }}" web_user: "{{ ansible_env.SUDO_USER }}"
app_home: "{{ web_root_path }}/{{ app_name }}_webapp"
# Virtualenvs # Virtualenvs
virtualenv_root: "{{ web_root_path }}/virtualenvs" virtualenv_root: "{{ web_root_path }}/virtualenvs"
@ -14,8 +10,6 @@ uwsgi_venv: "{{ virtualenv_root }}/uwsgi"
app_venv: "{{ virtualenv_root }}/{{ app_name }}" app_venv: "{{ virtualenv_root }}/{{ app_name }}"
# NGINX # NGINX
nginx_hostname: localhost
nginx_app_static: "{{ app_home }}/{{ app_name }}/static/"
nginx_app_conf: "{{ app_name }}_uwsgi_nginx.conf" nginx_app_conf: "{{ app_name }}_uwsgi_nginx.conf"
# Supervisor # Supervisor
@ -24,6 +18,4 @@ supervisor_app_config: "{{ app_name }}_supervisor.conf"
# UWSGI # UWSGI
uwsgi_config: "{{ web_root_path }}/config/uwsgi" uwsgi_config: "{{ web_root_path }}/config/uwsgi"
uwsgi_app_ini: "{{ app_name }}_uwsgi.ini" uwsgi_app_ini: "{{ app_name }}_uwsgi.ini"
uwsgi_port: 8001
uwsgi_service_name: "{{ app_name }}_uwsgi" uwsgi_service_name: "{{ app_name }}_uwsgi"
uwsgi_app_executable: rookeries:make_rookeries_app()