Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ICDS Tableau server references and unused vars #6363

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions environments/india/proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions src/commcare_cloud/ansible/deploy_proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/commcare_cloud/ansible/roles/nginx/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 0 additions & 22 deletions src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau.yml

This file was deleted.

12 changes: 0 additions & 12 deletions src/commcare_cloud/ansible/roles/nginx/vars/icds_tableau_http.yml

This file was deleted.

7 changes: 1 addition & 6 deletions src/commcare_cloud/environment/schemas/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Loading