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.

Sign up for GitHub

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 PNA environment and variable references #6366

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Remove PNA environment and variable references #6366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac39254
remove pna environment
nospame Aug 14, 2024
7847541
remove pna_ssl / pna_proxy
nospame Aug 14, 2024
a0f2a73
remove remaining references to pna environment or PNA_SITE_HOST
nospame Aug 14, 2024
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
4 changes: 2 additions & 2 deletions src/commcare_cloud/ansible/deploy_common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
tags: common

- name: ufw (firewall)
hosts: 'all_commcarehq:!proxy:!cas_proxy:!pna_proxy:!couchdb2_proxy:!reach_proxy'
hosts: 'all_commcarehq:!proxy:!cas_proxy:!couchdb2_proxy:!reach_proxy'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume cas_proxy is also obsolete. Same below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good call. I missed that on #6358

become: true
roles:
- {role: ufw, tags: ufw, when: ufw_private_interface is defined}
tags: common

- name: ufw (proxy firewall)
hosts: 'proxy:cas_proxy:pna_proxy:couchdb2_proxy:reach_proxy'
hosts: 'proxy:cas_proxy:couchdb2_proxy:reach_proxy'
become: true
tasks:
- import_tasks: roles/ufw/tasks/proxy_ufw.yml
Expand Down
12 changes: 0 additions & 12 deletions src/commcare_cloud/ansible/deploy_proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,6 @@
tags:
- nginx_sites

- name: PNA Proxy
hosts: pna_proxy
tasks:
- include_role:
name: {name: nginx, tags: nginx_sites}
tasks_from: set_site_present
vars:
site_present: "{{ 'pna_ssl' in special_sites }}"
site_config: {name: pna_ssl, vars_file: pna_ssl}
tags:
- nginx_sites

- name: Nginx log rolling configurations
hosts:
- proxy
Expand Down
50 changes: 0 additions & 50 deletions src/commcare_cloud/ansible/roles/nginx/vars/pna_ssl.yml
View file
Open in desktop

This file was deleted.