Moving vars around

diff --git a/ch13/ansible/container.yml b/ch13/ansible/container.yml
index 39c7f90..c41fb59 100644 (file)
--- a/ch13/ansible/container.yml
+++ b/ch13/ansible/container.yml
@@ -3,9 +3,6 @@ defaults:
   database_name: mezzanine
   database_user: mezzanine
   database_password: mezzanine
-  mezzanine_proj_app: mezzanine_example
-  mezzanine_proj_name: "{{ mezzanine_proj_app }}"
-  locale: en_US.UTF-8
   database_host: postgres
   database_port: 5432
 

diff --git a/ch13/ansible/roles/mezzanine/vars/main.yml b/ch13/ansible/roles/mezzanine/vars/main.yml
index 8543db4..e7bea70 100644 (file)
--- a/ch13/ansible/roles/mezzanine/vars/main.yml
+++ b/ch13/ansible/roles/mezzanine/vars/main.yml
@@ -1,6 +1,8 @@
 ---
 # vars file for mezzanine
 mezzanine_root_dir: /srv
+mezzanine_proj_app: mezzanine_example
+mezzanine_proj_name: "{{ mezzanine_proj_app }}"
 mezzanine_user: "{{ ansible_user }}"
 mezzanine_venv_home: "{{ mezzanine_root_dir }}/.virtualenvs"
 mezzanine_venv_path: "{{ mezzanine_venv_home }}/{{ mezzanine_proj_name }}"
@@ -13,6 +15,7 @@ mezzanine_python: "{{ mezzanine_venv_path }}/bin/python"
 mezzanine_manage: "{{ mezzanine_python }} {{ mezzanine_proj_path }}/manage.py"
 mezzanine_num_workers: "multiprocessing.cpu_count() * 2 + 1"
 mezzanine_gunicorn_procname: gunicorn_mezzanine
+locale: en_US.UTF-8
 
 # Eventually, we will pass these as env vars
 database_name: mezzanine