From 6a23383222499557bee3140dd60981c03e436879 Mon Sep 17 00:00:00 2001 From: Alex Hall <864349+compuguy@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:04:18 -0500 Subject: [PATCH] Remove duplicate Sidekiq Scheduler instance. --- mastodon.yaml | 71 --------------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/mastodon.yaml b/mastodon.yaml index 71f18b0..4af5645 100644 --- a/mastodon.yaml +++ b/mastodon.yaml @@ -437,77 +437,6 @@ Resources: OperatingSystemFamily: 'LINUX' ExecuteCommand: true TemplateURL: './node_modules/@cfn-modules/fargate-service/module.yml' - SidekiqServiceScheduler: - Type: 'AWS::CloudFormation::Stack' - Properties: - Parameters: - ClusterModule: !GetAtt 'Cluster.Outputs.StackName' - VpcModule: !GetAtt 'Vpc.Outputs.StackName' - AlertingModule: !GetAtt 'Alerting.Outputs.StackName' - ClientSgModule1: !GetAtt 'ClientSg.Outputs.StackName' - ManagedPolicyArns: !Ref S3Policy - AppImage: 'ghcr.io/glitch-soc/mastodon:nightly.2024-02-17-security' - AppCommand: 'bash,-c,bundle exec sidekiq -q scheduler' - AppEnvironment1Key: 'LOCAL_DOMAIN' - AppEnvironment1Value: !Ref DomainName - AppEnvironment2Key: 'REDIS_HOST' - AppEnvironment2Value: !GetAtt 'Cache.Outputs.DnsName' - AppEnvironment3Key: 'DB_PASS' - AppEnvironment3SecretModule: !GetAtt 'Secret.Outputs.StackName' - AppEnvironment4Key: 'ES_ENABLED' - AppEnvironment4Value: 'false' - AppEnvironment4SecretModule: '' - AppEnvironment5Key: 'SECRET_KEY_BASE' - AppEnvironment5Value: !Ref SecretKeyBase - AppEnvironment5SecretModule: '' - AppEnvironment6Key: 'OTP_SECRET' - AppEnvironment6Value: !Ref OtpSecret - AppEnvironment7Key: 'VAPID_PRIVATE_KEY' - AppEnvironment7Value: !Ref VapidPrivateKey - AppEnvironment8Key: 'VAPID_PUBLIC_KEY' - AppEnvironment8Value: !Ref VapidPublicKey - AppEnvironment9Key: 'S3_ENABLED' - AppEnvironment9Value: 'true' - AppEnvironment10Key: 'S3_BUCKET' - AppEnvironment10Value: !GetAtt 'Bucket.Outputs.Name' - AppEnvironment11Key: 'DB_NAME' - AppEnvironment11Value: 'mastodon' - AppEnvironment12Key: 'DB_USER' - AppEnvironment12Value: 'mastodon' - AppEnvironment13Key: 'DB_HOST' - AppEnvironment13Value: !GetAtt 'Database.Outputs.DnsName' - AppEnvironment14Key: 'RAILS_ENV' - AppEnvironment14Value: 'production' - AppEnvironment15Key: 'SMTP_SERVER' - AppEnvironment15Value: !Sub 'email-smtp.${AWS::Region}.amazonaws.com' - AppEnvironment16Key: 'SMTP_PORT' - AppEnvironment16Value: '587' - AppEnvironment17Key: 'SMTP_LOGIN' - AppEnvironment17Value: !Ref 'EmailUserAccessKey' - AppEnvironment18Key: 'SMTP_PASSWORD' - AppEnvironment18Value: !GetAtt 'SmtpPasswordConverter.SmtpPassword' - AppEnvironment19Key: 'SMTP_FROM_ADDRESS' - AppEnvironment19Value: !Sub 'noreply@${DomainName}' - AppEnvironment20Key: 'S3_REGION' - AppEnvironment20Value: !Ref 'AWS::Region' - AppEnvironment21Key: 'S3_ALIAS_HOST' - AppEnvironment21Value: !GetAtt 'CloudFront.Outputs.DistributionDomainName' - AppEnvironment22Key: 'S3_PERMISSION' - AppEnvironment22Value: 'private' - Cpu: '0.25' - Memory: '0.5' - DesiredCount: '1' - MaxCapacity: '1' - MinCapacity: '1' - LogsRetentionInDays: '14' - SubnetsReach: 'Public' - AutoScaling: 'false' - HealthCheckGracePeriodSeconds: '120' - Spot: !Ref Spot - CpuArchitecture: 'X86_64' - OperatingSystemFamily: 'LINUX' - ExecuteCommand: true - TemplateURL: './node_modules/@cfn-modules/fargate-service/module.yml' SidekiqServiceMailers: Type: 'AWS::CloudFormation::Stack' Properties: