diff --git a/environments/india/proxy.yml b/environments/india/proxy.yml index 1f91dd7422..7830b1ce00 100644 --- a/environments/india/proxy.yml +++ b/environments/india/proxy.yml @@ -2,8 +2,6 @@ fake_ssl_cert: yes SITE_HOST: 'india.commcarehq.org' CAS_SITE_HOST: 'cas.commcarehq.org' J2ME_SITE_HOST: 'j2me-india.commcarehq.org' -tableau_server: 'tableau2.internal.commcarehq.org' -TABLEAU_HOST: 'icds.commcarehq.org' primary_ssl_env: "india" nginx_hsts_max_age: 31536000 # 1 year trusted_proxies: diff --git a/src/commcare_cloud/ansible/deploy_proxy.yml b/src/commcare_cloud/ansible/deploy_proxy.yml index 4a75f5916e..71d169cf68 100644 --- a/src/commcare_cloud/ansible/deploy_proxy.yml +++ b/src/commcare_cloud/ansible/deploy_proxy.yml @@ -77,8 +77,6 @@ with_items: - {name: wiki, vars_file: wiki} - {name: wiki, vars_file: wiki_http} - - {name: icds_tableau, vars_file: icds_tableau} - - {name: icds_tableau, vars_file: icds_tableau_http} loop_control: loop_var: site_config tags: nginx_sites diff --git a/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml b/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml index c6d4623601..cc94b0118f 100644 --- a/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml +++ b/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml @@ -1,7 +1,5 @@ J2ME_SITE_HOST: null NO_WWW_SITE_HOST: null -TABLEAU_HOST: null -tableau_server: null special_sites: [ ] primary_ssl_env: "" nginx_hsts_max_age: null diff --git a/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau.yml b/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau.yml deleted file mode 100644 index f4e2105013..0000000000 --- a/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -nginx_ssl_cert: "{{ tableau_nginx_ssl_cert }}" -nginx_ssl_key: "{{ tableau_nginx_ssl_key }}" - -nginx_sites: -- server: - file_name: icds_tableau - listen: "443 ssl" - # Move these to a localsetting? - server_name: "{{ TABLEAU_HOST }}" - client_max_body_size: 100m - proxy_set_headers: - - "Host $host" - - "X-Forwarded-For $remote_addr" - - "X-Forwarded-Proto $scheme" - - "X-Forwarded-Host $host:443" - locations: - - name: / - proxy_pass: "http://{{ tableau_server }}" - proxy_read_timeout: 120s - - name: /errors - alias: "{{ errors_home }}/pages" diff --git a/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau_http.yml b/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau_http.yml deleted file mode 100644 index b00f9e1c30..0000000000 --- a/src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau_http.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Send anything from http -> https -nginx_sites: -- server: - file_name: "icds_tableau_http" - listen: "80" - server_name: "{{ TABLEAU_HOST }}" - proxy_set_headers: - - "Host $host" - locations: - - name: / - return: "301 https://$server_name" diff --git a/src/commcare_cloud/environment/schemas/proxy.py b/src/commcare_cloud/environment/schemas/proxy.py index 42813216b6..1e6ddf4fa7 100644 --- a/src/commcare_cloud/environment/schemas/proxy.py +++ b/src/commcare_cloud/environment/schemas/proxy.py @@ -23,7 +23,7 @@ class ProxyConfig(jsonobject.JsonObject): trusted_proxies = jsonobject.ListProperty(str) special_sites = jsonobject.ListProperty(str) - + extra_sites = jsonobject.ListProperty(str) nginx_block_ips = jsonobject.ListProperty(str) @@ -36,11 +36,6 @@ class ProxyConfig(jsonobject.JsonObject): reach_errors_home = jsonobject.StringProperty(exclude_if_none=True) reach_commcare_errors_branch = jsonobject.StringProperty(exclude_if_none=True) - TABLEAU_HOST = jsonobject.StringProperty(exclude_if_none=True) - tableau_nginx_combined_cert_value = jsonobject.StringProperty(exclude_if_none=True) - tableau_key_value = jsonobject.StringProperty(exclude_if_none=True) - tableau_server = jsonobject.StringProperty(exclude_if_none=True) - PNA_SITE_HOST = jsonobject.StringProperty(exclude_if_none=True) pna_nginx_combined_cert_value = jsonobject.StringProperty(exclude_if_none=True) pna_key_value = jsonobject.StringProperty(exclude_if_none=True)