dimagi · nospame · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024
diff --git a/.tests/environments/testenv/public.yml b/.tests/environments/testenv/public.yml
@@ -77,7 +77,6 @@ localsettings:
   EMAIL_USE_TLS: no
   FULLSTORY_ID:
   HQ_INSTANCE: 'dev'
-  J2ME_ADDRESS: ''
   LOCAL_PILLOWS:
     custom:
       - name: 'kafka-ucr-main-custom-1'

diff --git a/commcare-cloud-bootstrap/environment/public.yml b/commcare-cloud-bootstrap/environment/public.yml
@@ -65,7 +65,6 @@ localsettings:
   EMAIL_USE_TLS: no
   FULLSTORY_ID:
   HQ_INSTANCE: 'dev'
-  J2ME_ADDRESS: ''
   REDIS_DB: '0'
   REDIS_HOST: "{{ groups.redis.0 }}"
   REDIS_PORT: '6379'

diff --git a/environments/64-test/public.yml b/environments/64-test/public.yml
@@ -61,7 +61,6 @@ localsettings:
   EMAIL_USE_TLS: yes
   FULLSTORY_ID:
   HQ_INSTANCE: 'dev'
-  J2ME_ADDRESS: ''
   REDIS_DB: '0'
   REDIS_HOST: "{{ groups.redis.0 }}"
   REDIS_PORT: '6379'

diff --git a/environments/backup-production/public.yml b/environments/backup-production/public.yml
@@ -189,7 +189,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: ""  
   LOCAL_CUSTOM_DB_ROUTING:
     auditcare: auditcare
     repeaters: repeaters

diff --git a/environments/development/public.yml b/environments/development/public.yml
@@ -80,7 +80,6 @@ localsettings:
 #  INVOICE_FROM_ADDRESS:
 #  INVOICE_PREFIX:
 #  INVOICE_STARTING_NUMBER:
-  J2ME_ADDRESS: ''
 #  MEDIA_ROOT:
 #  PILLOWTOP_MACHINE_ID:
   REDIS_DB: '0'

diff --git a/environments/enikshay-reference/public.yml b/environments/enikshay-reference/public.yml
@@ -65,7 +65,6 @@ localsettings:
   EMAIL_USE_TLS: no
   FULLSTORY_ID:
   HQ_INSTANCE: 'dev'
-  J2ME_ADDRESS: ''
   REDIS_DB: '0'
   REDIS_HOST: "{{ groups.redis.0 }}"
   REDIS_PORT: '6379'

diff --git a/environments/india/proxy.yml b/environments/india/proxy.yml
@@ -1,7 +1,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"

diff --git a/environments/india/public.yml b/environments/india/public.yml
@@ -114,7 +114,6 @@ TWO_FACTOR_GATEWAY_ENABLED: True
 localsettings:
   ALLOWED_HOSTS:
     - "{{ CAS_SITE_HOST }}"
-    - "{{ J2ME_SITE_HOST }}"
   ALLOW_MAKE_SUPERUSER_COMMAND: False  
   ASYNC_INDICATORS_TO_QUEUE: 30000
   AUDIT_ALL_VIEWS: True
@@ -172,7 +171,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: India-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: "{{ J2ME_SITE_HOST }}"
   LOCAL_CUSTOM_DB_ROUTING:
     auditcare: auditcare
     repeaters: repeaters

diff --git a/environments/pna/public.yml b/environments/pna/public.yml
@@ -108,7 +108,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: ''
 #  KAFKA_HOST:
   #  PILLOWTOP_MACHINE_ID:
   REDIS_DB: '0'

diff --git a/environments/production/proxy.yml b/environments/production/proxy.yml
@@ -1,7 +1,6 @@
 fake_ssl_cert: yes
 SITE_HOST: 'www.commcarehq.org'
 NO_WWW_SITE_HOST: 'commcarehq.org'
-J2ME_SITE_HOST: 'j2mewww.commcarehq.org'
 # This sets production_commcare as the default endpoint for ssl connections
 primary_ssl_env: "production"
 trusted_proxies:

diff --git a/environments/production/public.yml b/environments/production/public.yml
@@ -138,7 +138,6 @@ localsettings:
   ALLOWED_HOSTS:
     - testserver
     - proxytest.commcarehq.org
-    - "{{ J2ME_SITE_HOST }}"
   ALLOW_MAKE_SUPERUSER_COMMAND: False
   ANALYTICS_DEBUG: False
   ANALYTICS_LOG_LEVEL: "warning"
@@ -213,7 +212,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: "{{ J2ME_SITE_HOST }}"
   LOCAL_CUSTOM_DB_ROUTING:
     auditcare: auditcare
     repeaters: repeaters

diff --git a/environments/staging/proxy.yml b/environments/staging/proxy.yml
@@ -1,6 +1,5 @@
 fake_ssl_cert: yes
 SITE_HOST: 'staging.commcarehq.org'
-J2ME_SITE_HOST: 'j2mestaging.commcarehq.org'
 primary_ssl_env: "staging"
 nginx_hsts_max_age: 31536000 # 1 year
 

diff --git a/environments/staging/public.yml b/environments/staging/public.yml
@@ -116,7 +116,6 @@ s3_blob_db_s3_bucket: 'dimagi-commcare-staging-blobdb'
 
 localsettings:
   ALLOWED_HOSTS:
-    - j2mestaging.commcarehq.org
     - testserver
   ALLOW_MAKE_SUPERUSER_COMMAND: False  
   ANALYTICS_DEBUG: True
@@ -155,7 +154,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: "{{ J2ME_SITE_HOST }}"
   LOCAL_CUSTOM_DB_ROUTING:
     auditcare: auditcare
     repeaters: repeaters

diff --git a/environments/swiss/public.yml b/environments/swiss/public.yml
@@ -161,7 +161,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: ''
 #  KAFKA_HOST:
   #  PILLOWTOP_MACHINE_ID:
   LOCAL_MIDDLEWARE:

diff --git a/quick_monolith_install/sample-environment/public.yml.j2 b/quick_monolith_install/sample-environment/public.yml.j2
@@ -103,7 +103,6 @@ localsettings:
     'website': "http://www.dimagi.com"
   INVOICE_PREFIX: INC-
   INVOICE_STARTING_NUMBER: 5000
-  J2ME_ADDRESS: ''
   PILLOW_RETRY_QUEUE_ENABLED: True
   REDIS_DB: '0'
   REDIS_HOST: "localhost"

diff --git a/src/commcare_cloud/ansible/deploy_proxy.yml b/src/commcare_cloud/ansible/deploy_proxy.yml
@@ -56,18 +56,6 @@
         loop_var: site_config
       tags: nginx_sites
 
-    - name: install j2me http site
-      include_role:
-        name: {name: nginx, tags: nginx_sites}
-        tasks_from: set_site_present
-      vars:
-        site_present: "{{ J2ME_SITE_HOST|default(None) is not none }}"
-      with_items:
-        - {name: cchq_http_j2me, vars_file: cchq_http_j2me}
-      loop_control:
-        loop_var: site_config
-      tags: nginx_sites
-
     - name: install other sites
       include_role:
         name: {name: nginx, tags: nginx_sites}

diff --git a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2
@@ -708,10 +708,6 @@ INACTIVITY_TIMEOUT = {{ localsettings.INACTIVITY_TIMEOUT }}
 # See corehq/apps/builds/README.md for more information.
 BASE_ADDRESS = '{{ SITE_HOST }}'
 
-{% if localsettings.get('J2ME_ADDRESS') %}
-J2ME_ADDRESS = '{{ localsettings.J2ME_ADDRESS }}'
-{% endif %}
-
 EMAIL_USE_TLS = {{ localsettings.EMAIL_USE_TLS }}
 
 BANK_ROUTING_NUMBER_ACH = '{{ BANK_ROUTING_NUMBER_ACH }}'

diff --git a/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml b/src/commcare_cloud/ansible/roles/nginx/defaults/main.yml
@@ -1,4 +1,3 @@
-J2ME_SITE_HOST: null
 NO_WWW_SITE_HOST: null
 TABLEAU_HOST: null
 tableau_server: null

diff --git a/src/commcare_cloud/ansible/roles/nginx/vars/cchq_http_j2me.yml b/src/commcare_cloud/ansible/roles/nginx/vars/cchq_http_j2me.yml
diff --git a/src/commcare_cloud/environment/schemas/proxy.py b/src/commcare_cloud/environment/schemas/proxy.py
@@ -8,7 +8,6 @@ class ProxyConfig(jsonobject.JsonObject):
 
     SITE_HOST = jsonobject.StringProperty(required=True)
     NO_WWW_SITE_HOST = jsonobject.StringProperty()
-    J2ME_SITE_HOST = jsonobject.StringProperty()
     nginx_combined_cert_value = jsonobject.StringProperty()
     nginx_key_value = jsonobject.StringProperty()
     nginx_hsts_max_age = jsonobject.IntegerProperty()
@@ -23,7 +22,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)