Valkey/Redis via TLS

widdix · Oct 10, 2024 · 091bd66 · 091bd66
1 parent 4153bda
commit 091bd66
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/mastodon.yaml b/mastodon.yaml
@@ -187,8 +187,8 @@ Resources:
         AppPort: '3000'
         AppEnvironment1Key: 'LOCAL_DOMAIN'
         AppEnvironment1Value: !Ref DomainName
-        AppEnvironment2Key: 'REDIS_HOST'
-        AppEnvironment2Value: !GetAtt 'ServerlessCache.Outputs.DnsName'
+        AppEnvironment2Key: 'REDIS_URL'
+        AppEnvironment2Value: !Sub 'rediss://${ServerlessCache.Outputs.DnsName}:6379'
         AppEnvironment3Key: 'DB_PASS'
         AppEnvironment3SecretModule: !GetAtt 'Secret.Outputs.StackName'
         AppEnvironment4Key: 'ES_ENABLED'
@@ -237,6 +237,8 @@ Resources:
         AppEnvironment24Value: !Ref ActiveRecordEncryptionKeyDerivationSalt
         AppEnvironment25Key: 'ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'
         AppEnvironment25Value: !Ref ActiveRecordEncryptionPrimaryKey
+        AppEnvironment26Key: 'REDIS_DRIVER'
+        AppEnvironment26Value: 'ruby'
         Cpu: '0.5'
         Memory: '1'
         DesiredCount: '1'
@@ -268,8 +270,8 @@ Resources:
         AppPort: '4000'
         AppEnvironment1Key: 'LOCAL_DOMAIN'
         AppEnvironment1Value: !Ref DomainName
-        AppEnvironment2Key: 'REDIS_HOST'
-        AppEnvironment2Value: !GetAtt 'ServerlessCache.Outputs.DnsName'
+        AppEnvironment2Key: 'REDIS_URL'
+        AppEnvironment2Value: !Sub 'rediss://${ServerlessCache.Outputs.DnsName}:6379'
         AppEnvironment3Key: 'DB_PASS'
         AppEnvironment3SecretModule: !GetAtt 'Secret.Outputs.StackName'
         AppEnvironment4Key: 'ES_ENABLED'
@@ -318,6 +320,8 @@ Resources:
         AppEnvironment24Value: !Ref ActiveRecordEncryptionKeyDerivationSalt
         AppEnvironment25Key: 'ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'
         AppEnvironment25Value: !Ref ActiveRecordEncryptionPrimaryKey
+        AppEnvironment26Key: 'REDIS_DRIVER'
+        AppEnvironment26Value: 'ruby'
         Cpu: '0.25'
         Memory: '0.5'
         DesiredCount: '1'
@@ -347,8 +351,8 @@ Resources:
         AppCommand: 'bash,-c,bundle exec sidekiq'
         AppEnvironment1Key: 'LOCAL_DOMAIN'
         AppEnvironment1Value: !Ref DomainName
-        AppEnvironment2Key: 'REDIS_HOST'
-        AppEnvironment2Value: !GetAtt 'ServerlessCache.Outputs.DnsName'
+        AppEnvironment2Key: 'REDIS_URL'
+        AppEnvironment2Value: !Sub 'rediss://${ServerlessCache.Outputs.DnsName}:6379'
         AppEnvironment3Key: 'DB_PASS'
         AppEnvironment3SecretModule: !GetAtt 'Secret.Outputs.StackName'
         AppEnvironment4Key: 'ES_ENABLED'
@@ -397,6 +401,8 @@ Resources:
         AppEnvironment24Value: !Ref ActiveRecordEncryptionKeyDerivationSalt
         AppEnvironment25Key: 'ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'
         AppEnvironment25Value: !Ref ActiveRecordEncryptionPrimaryKey
+        AppEnvironment26Key: 'REDIS_DRIVER'
+        AppEnvironment26Value: 'ruby'
         Cpu: '0.25'
         Memory: '1'
         DesiredCount: '1'
@@ -426,8 +432,8 @@ Resources:
         AppCommand: 'bash,-c,RAILS_ENV=production bin/tootctl media remove && RAILS_ENV=production bin/tootctl preview_cards remove'
         AppEnvironment1Key: 'LOCAL_DOMAIN'
         AppEnvironment1Value: !Ref DomainName
-        AppEnvironment2Key: 'REDIS_HOST'
-        AppEnvironment2Value: !GetAtt 'ServerlessCache.Outputs.DnsName'
+        AppEnvironment2Key: 'REDIS_URL'
+        AppEnvironment2Value: !Sub 'rediss://${ServerlessCache.Outputs.DnsName}:6379'
         AppEnvironment3Key: 'DB_PASS'
         AppEnvironment3SecretModule: !GetAtt 'Secret.Outputs.StackName'
         AppEnvironment4Key: 'ES_ENABLED'
@@ -476,6 +482,8 @@ Resources:
         AppEnvironment24Value: !Ref ActiveRecordEncryptionKeyDerivationSalt
         AppEnvironment25Key: 'ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY'
         AppEnvironment25Value: !Ref ActiveRecordEncryptionPrimaryKey
+        AppEnvironment26Key: 'REDIS_DRIVER'
+        AppEnvironment26Value: 'ruby'
         Cpu: '1'
         Memory: '2'
         LogsRetentionInDays: '14'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "@cfn-modules/elasticache-redis": "^1.0.1",
     "@cfn-modules/elasticache-serverless": "^0.1.0",
     "@cfn-modules/fargate-scheduled-task": "^1.6.0",
-    "@cfn-modules/fargate-service": "^2.14.1",
+    "@cfn-modules/fargate-service": "^2.15.0",
     "@cfn-modules/kms-key": "^1.2.1",
     "@cfn-modules/lb-dns-record": "^1.1.1",
     "@cfn-modules/rds-aurora-serverless-postgres": "^1.1.0",