From 17223c71540ee7df6ff51570da0c551252d0ce13 Mon Sep 17 00:00:00 2001 From: Luke Shay Date: Thu, 16 Nov 2023 11:40:52 -0600 Subject: [PATCH] fixed domains --- apps/infra/cdk.context.json | 17 ++++------------- apps/infra/src/lib/stacks/redirect-stack.ts | 4 ++-- apps/infra/src/lib/stacks/website-stack.ts | 10 ---------- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/apps/infra/cdk.context.json b/apps/infra/cdk.context.json index d43aa62..7a91934 100644 --- a/apps/infra/cdk.context.json +++ b/apps/infra/cdk.context.json @@ -1,15 +1,6 @@ { - "acknowledged-issue-numbers": [8607], - "hosted-zone:account=357382603627:domainName=astro-aws.org:region=us-east-1": { - "Id": "/hostedzone/Z07804331OLCIOIZL4YQN", - "Name": "astro-aws.org." - }, - "hosted-zone:account=738697399292:domainName=astro-aws.org:region=us-east-1": { - "Id": "/hostedzone/Z0584480MGUI8KRBPWM", - "Name": "astro-aws.org." - }, - "hosted-zone:account=738697399292:domainName=astro-aws.org:region=us-east-2": { - "Id": "/hostedzone/Z0584480MGUI8KRBPWM", - "Name": "astro-aws.org." - } + "hosted-zone:account=738697399292:domainName=astro-aws.org:region=us-east-1": { + "Id": "/hostedzone/Z0584480MGUI8KRBPWM", + "Name": "astro-aws.org." + } } diff --git a/apps/infra/src/lib/stacks/redirect-stack.ts b/apps/infra/src/lib/stacks/redirect-stack.ts index 0d9f11c..d811621 100644 --- a/apps/infra/src/lib/stacks/redirect-stack.ts +++ b/apps/infra/src/lib/stacks/redirect-stack.ts @@ -68,13 +68,13 @@ export class RedirectStack extends Stack { }) new ARecord(this, "ARecord", { - recordName: domainName, + recordName: `www.${domainName}`, target: RecordTarget.fromAlias(new CloudFrontTarget(distribution)), zone: hostedZone, }) new AaaaRecord(this, "AaaaRecord", { - recordName: domainName, + recordName: `www.${domainName}`, target: RecordTarget.fromAlias(new CloudFrontTarget(distribution)), zone: hostedZone, }) diff --git a/apps/infra/src/lib/stacks/website-stack.ts b/apps/infra/src/lib/stacks/website-stack.ts index 2a91cbc..eaeab84 100644 --- a/apps/infra/src/lib/stacks/website-stack.ts +++ b/apps/infra/src/lib/stacks/website-stack.ts @@ -67,22 +67,12 @@ class WebsiteStack extends Stack { minTtl: Duration.days(365), }) - // const cfLogInjestFunction = Function.fromFunctionAttributes(this, "CfLogInjestLambda", { - // architecture: Architecture.ARM_64, - // functionArn: "arn:aws:lambda:us-east-1:738697399292:function:CfLogIngestStack-LambdaD247545B-IHTgL5hMPXUT", - // sameEnvironment: false, - // }); - const accessLogBucket = new Bucket(this, "AccessLogBucket", { accessControl: BucketAccessControl.LOG_DELIVERY_WRITE, blockPublicAccess: BlockPublicAccess.BLOCK_ALL, encryption: BucketEncryption.S3_MANAGED, }) - // accessLogBucket.addObjectCreatedNotification(new LambdaDestination(cfLogInjestFunction), { - // prefix: "cloudfront/", - // }); - const astroAwsConstruct = new AstroAWS(this, "AstroAWSConstruct", { cdk: { cloudfrontDistribution: {