variable naming consistency

playbooks/roles/discern/defaults/main.yml

+DISCERN_NGINX_PORT: 80
+
 discern_source_repo: https://github.com/edx/discern.git
 ease_source_repo: https://github.com/edx/ease.git
 ease_dir: $app_base_dir/ease
@@ -6,7 +8,6 @@ discern_settings: discern.aws
 nltk_data_dir: /usr/share/nltk_data
 ease_branch: master
 discern_branch: dev
-discern_nginx_port: 80
 gunicorn_port: 7999
 discern_user: discern
 site_name: discern

playbooks/roles/edxapp/defaults/main.yml

@@ -235,9 +235,9 @@ edx_platform_code_dir: "{{ app_base_dir }}/edx-platform"
 
 
 # gunicorn ports, these shouldn't need to be overridden
-edxapp_cms_app_port: 8010
-edxapp_lms_app_port: 8000
-edxapp_lms_preview_app_port: 8020
+edxapp_cms_gunicorn_port: 8010
+edxapp_lms_gunicorn_port: 8000
+edxapp_lms_preview_gunicorn_port: 8020
 
 
 

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -16,7 +16,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.cms }}
 {% else %}
 env WORKERS={{ worker_core_mult.cms }}
 {% endif %}
-env PORT={{edxapp_cms_app_port}}
+env PORT={{edxapp_cms_gunicorn_port}}
 env ADDRESS={{edxapp_cms_app_address}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=cms.envs.aws

playbooks/roles/edxapp/templates/lms-preview.conf.j2

@@ -17,7 +17,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms_preview }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms_preview }}
 {% endif %}
-env PORT={{edxapp_lms_preview_app_port}}
+env PORT={{edxapp_lms_preview_gunicorn_port}}
 env ADDRESS={{edxapp_lms_preview_app_address}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -14,7 +14,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms }}
 {% endif %}
-env PORT={{edxapp_lms_app_port}}
+env PORT={{edxapp_lms_gunicorn_port}}
 env ADDRESS={{edxapp_lms_app_address}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE={{ edxapp_lms_env }}

playbooks/roles/nginx/templates/discern.j2

 server {
-    listen {{discern_nginx_port}};
+    listen {{ DISCERN_NGINX_PORT }};
     server_name localhost;
 
     set $my_host $http_host;
@@ -9,7 +9,7 @@ server {
 
     # https://docs.djangoproject.com/en/dev/howto/static-files/#serving-static-files-in-production
     location /static/ { # STATIC_URL
-        alias {{discern_dir}}/staticfiles/;
+        alias {{ discern_dir }}/staticfiles/;
         expires 1m;
 	autoindex on;
     }

playbooks/roles/nginx/templates/ora.j2

@@ -4,7 +4,7 @@ upstream app_server {
 }
 
 server {
-  listen {{ ora_nginx_port}} default_server;
+  listen {{ ORA_NGINX_PORT }} default_server;
 
   location / {
 

playbooks/roles/nginx/templates/xqueue.j2

@@ -4,7 +4,7 @@ upstream xqueue_app_server {
 }
 
 server {
-  listen {{ xqueue_nginx_port }} default_server;
+  listen {{ XQUEUE_NGINX_PORT }} default_server;
 
   location / {
     try_files $uri @proxy_to_app;

playbooks/roles/ora/defaults/main.yml

 # vars for the ORA role
 ---
+ORA_NGINX_PORT: 18091
+
 ora_code_dir: "{{ app_base_dir }}/edx-ora"
 # Default nginx listen port
 # These should be overrided if you want
@@ -9,7 +11,6 @@ ora_user_home: "/opt/edx-ora"
 ora_venv_dir: "{{ ora_user_home }}/virtualenvs/{{ ora_user }}"
 ease_venv_dir: "{{ ora_venv_dir }}"
 ora_gunicorn_workers: 4
-ora_nginx_port: 18091
 ora_gunicorn_port: 8091
 
 # ora_env_config and ora_auth_config

playbooks/roles/xqueue/defaults/main.yml

 # variables common to the xqueue role, automatically loaded
 # when the role is included
 ---
+XQUEUE_NGINX_PORT: 18040
+
 xqueue_code_dir: "{{ app_base_dir }}/xqueue"
 
 # Default nginx listen port
 # These should be overrided if you want
 # to serve all content on port 80
 xqueue_code_dir: "{{ app_base_dir }}/xqueue"
-xqueue_nginx_port: 18040
 xqueue_gunicorn_port: 8040
 
 xqueue_user: "xqueue"