Merge pull request #704 from PRX/feat/publicfeedsdotnet

Publicfeeds.net
PRX · Sep 18, 2023 · b9a3d9b · b9a3d9b
2 parents 79c4328 + 2c38140
commit b9a3d9b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/spire/templates/apps-200A.yml b/spire/templates/apps-200A.yml
@@ -66,6 +66,7 @@ Parameters:
   MetricsHostname: { Type: String }
   NetworksHostname: { Type: String }
   PlayHostname: { Type: String }
+  FeederCdnHostname: { Type: String }
   PublicFeedsHostname: { Type: String }
   RemixHostname: { Type: String }
   SharedAuroraMysqlEndpoint: { Type: String }
@@ -287,6 +288,7 @@ Resources:
         IdHostname: !Ref IdHostname
         PlayHostname: !Ref PlayHostname
         BetaHostname: !Ref BetaHostname
+        FeederCdnHostname: !Ref FeederCdnHostname
         PublicFeedsHostname: !Ref PublicFeedsHostname
         DovetailAppleApiBridgeEndpointUrl: !Ref DovetailAppleApiBridgeEndpointUrl
         EchoServiceToken: !Ref EchoServiceToken

diff --git a/spire/templates/apps/feeder.yml b/spire/templates/apps/feeder.yml
@@ -59,6 +59,7 @@ Parameters:
   FeederHostname: { Type: String }
   FeederAuthProxyHostname: { Type: String }
   FeederAuthProxyInternalHostname: { Type: String }
+  FeederCdnHostname: { Type: String }
   PublicFeedsHostname: { Type: String }
   DovetailAppleApiBridgeEndpointUrl: { Type: String }
 
@@ -644,7 +645,7 @@ Resources:
             - Name: DOVETAIL_HOST
               Value: !Ref DovetailRouterHostname
             - Name: FEEDER_CDN_HOST
-              Value: !Ref PublicFeedsHostname
+              Value: !Ref FeederCdnHostname
             - Name: FEEDER_CDN_PRIVATE_HOST
               Value: !Ref FeederAuthProxyHostname
             - Name: FEEDER_HOST
@@ -667,6 +668,8 @@ Resources:
               Value: !Ref SharedAuroraPostgresqlPort
             - Name: PRX_HOST
               Value: !Ref BetaHostname
+            - Name: PUBLIC_FEEDS_URL_PREFIX
+              Value: !Sub https://${PublicFeedsHostname}/f
             - Name: RAILS_ENV
               Value: !Ref EnvironmentTypeLowercase
             - Name: UPLOAD_BUCKET_NAME
@@ -784,7 +787,7 @@ Resources:
             - Name: DOVETAIL_HOST
               Value: !Ref DovetailRouterHostname
             - Name: FEEDER_CDN_HOST
-              Value: !Ref PublicFeedsHostname
+              Value: !Ref FeederCdnHostname
             - Name: FEEDER_CDN_PRIVATE_HOST
               Value: !Ref FeederAuthProxyHostname
             - Name: FEEDER_HOST
@@ -805,6 +808,8 @@ Resources:
               Value: !Ref SharedAuroraPostgresqlPort
             - Name: PRX_HOST
               Value: !Ref BetaHostname
+            - Name: PUBLIC_FEEDS_URL_PREFIX
+              Value: !Sub https://${PublicFeedsHostname}/f
             - Name: RAILS_ENV
               Value: !Ref EnvironmentTypeLowercase
             - Name: START_SAY_WHEN
@@ -942,7 +947,7 @@ Resources:
       Description: !Sub Feeder ${EnvironmentType} private feed proxy server
       Environment:
         Variables:
-          PUBLIC_FEED_DOMAIN: !Ref PublicFeedsHostname
+          PUBLIC_FEED_DOMAIN: !Ref FeederCdnHostname
       Events:
         ApiRootRequest:
           Properties:

diff --git a/spire/templates/constants.yml b/spire/templates/constants.yml
@@ -41,7 +41,8 @@ Mappings:
       TheWorldSearchInternalHostname: search.staging.theworld.prx.tech
       AdFilesHostname: a.prxu.org
       MetaHostname: meta.prx.org
-      PublicFeedsHostname: f-staging.prxu.org
+      FeederCdnHostname: f-staging.prxu.org
+      PublicFeedsHostname: staging.publicfeeds.net
     Production:
       EnvironmentTypeAbbreviation: prod
       EnvironmentTypeLowercase: production
@@ -72,7 +73,8 @@ Mappings:
       TheWorldSearchInternalHostname: search.theworld.prx.tech
       AdFilesHostname: a.prxu.org
       MetaHostname: meta.prx.org
-      PublicFeedsHostname: f.prxu.org
+      FeederCdnHostname: f.prxu.org
+      PublicFeedsHostname: publicfeeds.net
 
 Resources:
   Placeholder: { Type: AWS::SNS::Topic }
@@ -119,5 +121,6 @@ Outputs:
   # Asset hostnames
   AdFilesHostname: { Value: !FindInMap [EnvironmentTypeMap, !Ref EnvironmentType, AdFilesHostname] }
   MetaHostname: { Value: !FindInMap [EnvironmentTypeMap, !Ref EnvironmentType, MetaHostname] }
+  FeederCdnHostname: { Value: !FindInMap [EnvironmentTypeMap, !Ref EnvironmentType, FeederCdnHostname] }
   PublicFeedsHostname: { Value: !FindInMap [EnvironmentTypeMap, !Ref EnvironmentType, PublicFeedsHostname] }
   WfmtHostname: { Value: !FindInMap [EnvironmentTypeMap, !Ref EnvironmentType, WfmtHostname] }
diff --git a/spire/templates/root.yml b/spire/templates/root.yml
@@ -653,6 +653,7 @@ Resources:
         MetricsHostname: !GetAtt Constants2.Outputs.MetricsHostname
         NetworksHostname: !GetAtt Constants2.Outputs.NetworksHostname
         PlayHostname: !GetAtt Constants2.Outputs.PlayHostname
+        FeederCdnHostname: !GetAtt Constants2.Outputs.FeederCdnHostname
         PublicFeedsHostname: !GetAtt Constants2.Outputs.PublicFeedsHostname
         RemixHostname: !GetAtt Constants2.Outputs.RemixHostname
         SharedAuroraMysqlEndpoint: !Ref SharedAuroraMysqlEndpoint