moving sites-enabled to /etc/nginx/sites-enabled

playbooks/roles/nginx/defaults/main.yml

@@ -54,7 +54,7 @@ nginx_server_static_dir: "{{ nginx_data_dir }}/server-static"
 nginx_conf_dir: "{{ nginx_app_dir }}/conf.d"
 nginx_log_dir: "{{ COMMON_LOG_DIR }}/nginx"
 nginx_sites_available_dir: "{{ nginx_app_dir }}/sites-available"
-nginx_sites_enabled_dir: "{{ nginx_app_dir }}/sites-enabled"
+nginx_sites_enabled_dir: "/etc/nginx/sites-enabled"
 nginx_user: root
 nginx_htpasswd_file: "{{ nginx_app_dir }}/nginx.htpasswd"
 nginx_default_sites: []
@@ -66,9 +66,9 @@ NGINX_EDXAPP_ENABLE_S3_MAINTENANCE: False
 nginx_default_error_page: "/server/server-error.html"
 NGINX_EDXAPP_ERROR_PAGES:
   "500": "{{ nginx_default_error_page}}"
-  "502": "{{ nginx_default_error_page}}"  
+  "502": "{{ nginx_default_error_page}}"
   "504": "{{ nginx_default_error_page}}"
-  
+
 CMS_HOSTNAME: '~^((stage|prod)-)?studio.*'
 
 nginx_template_dir: "edx/app/nginx/sites-available"

playbooks/roles/nginx/templates/etc/nginx/nginx.conf.j2

@@ -62,7 +62,7 @@ http {
         # Virtual Host Configs
         ##
 
-        include {{ nginx_sites_enabled_dir }}/*;
         include {{ nginx_conf_dir }}/*.conf;
+        include /etc/nginx/sites-enabled/*;
 }