Merge pull request #4612 from edx/jibsheet/remove-unused-release_version

Clean up old nginx sites

CHANGELOG.md

+- nginx:
+  - remove nginx_cfg - an internal variable that was really only used for the edx-release nginx site, which served version.{html,json} off of a nonstandard port.  The file it served was never populated.
+
 - Structure: edx-east
   - Deprecated the edx-east folder, playbooks now live in the top level directory instead of edx-east/playbooks. A symbolic link was added for now, but should not be relied upon.
 

playbooks/roles/nginx/defaults/main.yml

@@ -141,17 +141,6 @@ nginx_ecommerce_gunicorn_hosts:
 nginx_credentails_gunicorn_hosts:
   - 127.0.0.1
 
-nginx_cfg:
-  #   - link - turn on
-  #   - absent - turn off
-  sites_enabled:
-    basic_auth: link
-    edx_release: link
-  # path to version files for the basic
-  # nginx configuration
-  version_html: "{{ nginx_app_dir }}/versions.html"
-  version_json: "{{ nginx_app_dir }}/versions.json"
-
 NGINX_ROBOT_RULES: [ ]
 NGINX_EDXAPP_EMBARGO_CIDRS: []
 NGINX_P3P_MESSAGE: 'CP="Open edX does not have a P3P policy."'

playbooks/roles/nginx/tasks/main.yml

@@ -110,7 +110,6 @@
     mode: "{{ item.mode }}"
   with_items:
     - { src: 'etc/nginx/nginx.conf.j2', dest: '/etc/nginx/nginx.conf', group: '{{ common_web_user }}', mode: "0644" }
-    - { src: 'edx/app/nginx/sites-available/edx-release.j2', dest: '{{ nginx_sites_available_dir }}/edx-release', group: 'root', mode: "0600" }
     - { src: 'edx/app/nginx/sites-available/maps.j2', dest: '{{ nginx_sites_available_dir }}/maps', group: 'root', mode: "0600" }
   notify: restart nginx
   tags:
@@ -139,7 +138,6 @@
     group: root
   notify: reload nginx
   with_items:
-    - "edx-release"
     - "maps"
   tags:
     - install

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/edx-release.j2

-server {
-    listen 8099 default_server;
-
-    location = /versions.html {
-        alias {{ nginx_cfg.version_html }};
-    }
-
-    location = /versions.json {
-        alias {{ nginx_cfg.version_json }};
-    }
-}