Skip to content

Commit 7db547d

Browse files
committed
Merge remote-tracking branch 'origin/main' into cleanup-podcast
2 parents 858b648 + 8c84117 commit 7db547d

File tree

6 files changed

+0
-70
lines changed

6 files changed

+0
-70
lines changed

pillars/3_HST/misc.sls

-9
This file was deleted.

pillars/5_HST__POD/misc__prod.sls

-1
This file was deleted.

pillars/infra/aws.sls

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ infra:
5858
cc:product: licensebuttons
5959
cc:purpose: static-hosting
6060
cc:team: internal-tech
61-
misc__prod:
62-
cc:environment: production
63-
cc:product: primary-website
64-
cc:purpose: static-hosting
65-
cc:team: internal-tech
6661
opencovid__prod:
6762
cc:environment: production
6863
cc:product: open-covid-pledge

pillars/infra/ec2_instance_web.sls

-5
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ infra:
7171
- ssh-from-salt-prime_core_secgroup
7272
- ssh-from-bastion_core_secgroup
7373
- web-all-chapters_stage_secgroup
74-
misc__prod:
75-
- pingtrace-all_core_secgroup
76-
- ssh-from-salt-prime_core_secgroup
77-
- ssh-from-bastion_core_secgroup
7874
opencovid__prod:
7975
- pingtrace-all_core_secgroup
8076
- ssh-from-salt-prime_core_secgroup
@@ -89,4 +85,3 @@ infra:
8985
# Default
9086
default: dmz
9187
# Specific (please maintain order)
92-
misc: private-one

pillars/infra/us-east-2/core.sls

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ infra:
2121
cert__prod: 10.22.10.29
2222
###_Private-One 10.22.11.0
2323
salt-prime__core: 10.22.11.11
24-
misc__prod: 10.22.11.15
2524
###_Private-Two 10.22.12.0
2625
subnets:
2726
dmz:

states/nginx/misc.sls

-49
This file was deleted.

0 commit comments

Comments
 (0)