remove remaining references to pna environment or PNA_SITE_HOST

dimagi · Aug 15, 2024 · a0f2a73 · a0f2a73
1 parent 7847541
commit a0f2a73
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 29 deletions.
diff --git a/docs/source/reference/1-commcare-cloud/1-installation.rst b/docs/source/reference/1-commcare-cloud/1-installation.rst
@@ -105,7 +105,7 @@ To check that commcare-cloud is now installed, run
    [email protected]:~$ commcare-cloud -h
    usage: commcare-cloud [-h] [--control]
 
-                         {64-test,development,echis,icds,icds-new,pna,production,softlayer,staging,swiss}
+                         {64-test,development,echis,icds,icds-new,production,softlayer,staging,swiss}
                          {bootstrap-users,ansible-playbook,django-manage,aps,tmux,ap,validate-environment-settings,deploy-stack,service,update-supervisor-confs,update-users,ping,migrate_couchdb,lookup,run-module,update-config,mosh,after-reboot,ssh,downtime,fab,update-local-known-hosts,migrate-couchdb,run-shell-command}
                          ...
 

diff --git a/src/commcare_cloud/ansible/roles/nginx/tasks/certs.yml b/src/commcare_cloud/ansible/roles/nginx/tasks/certs.yml
@@ -53,26 +53,6 @@
   tags:
     - link_ssl_cas
 
-- name: Link PNA SSL cert
-  become: yes
-  file:
-    src: "/etc/letsencrypt/live/{{PNA_SITE_HOST}}/fullchain.pem"
-    dest: "{{ ssl_certs_dir }}/{{ pna_nginx_ssl_cert }}"
-    state: link
-  when: not fake_ssl_cert and PNA_SITE_HOST | default(None)
-  tags:
-    - link_pna_cas
-
-- name: Link PNA SSL Key
-  become: yes
-  file:
-    src: "/etc/letsencrypt/live/{{PNA_SITE_HOST}}/privkey.pem"
-    dest: "{{ ssl_keys_dir }}/{{ pna_nginx_ssl_key  }}"
-    state: link
-  when: not fake_ssl_cert and PNA_SITE_HOST | default(None)
-  tags:
-    - link_pna_cas
-
 - name: Link REACH SSL cert
   become: yes
   file:

diff --git 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)
@@ -41,10 +41,6 @@ class ProxyConfig(jsonobject.JsonObject):
     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)
-
     def check(self):
         pass
 

diff --git a/src/commcare_cloud/manage_commcare_cloud/monitors/pillow_errors.yml b/src/commcare_cloud/manage_commcare_cloud/monitors/pillow_errors.yml
@@ -6,9 +6,6 @@ message: |
   {{#is_match "environment.name" "icds-new"}}
   https://www.icds-cas.gov.in/hq/admin/pillow_errors
   {{/is_match}}
-  {{#is_match "environment.name" "pna"}}
-  https://pna.commcarehq.org/hq/admin/pillow_errors
-  {{/is_match}}
   {{#is_match "environment.name" "india"}}
   https://india.commcarehq.org/hq/admin/pillow_errors
   {{/is_match}}