Merge branch 'loadbalanced' into develop

.ebextensions/01-strapi-assets-s3.config

@@ -0,0 +1,5 @@
+# Resources:
+#   ElasticLoadBalancer:
+#     Type: AWS::ElasticLoadBalancingV2::TargetGroup
+#     Properties:
+#       VpcId: vpc-029d232726cbf591d

.ebextensions/03-general-options.config

@@ -1,6 +1,6 @@
 option_settings:
-  aws:elasticbeanstalk:environment:
-    EnvironmentType: SingleInstance
+  # aws:elasticbeanstalk:environment:
+  #   EnvironmentType: SingleInstance
   aws:rds:dbinstance:
     DBEngine: postgres
     DBInstanceClass: "db.t2.micro"

.ebextensions/04-environment.config

@@ -5,11 +5,21 @@ option_settings:
     value: false
   - option_name: STRAPI_LOG_LEVEL
     value: debug
-  - option_name: STRAPI_S3_ACCESS_KEY
-    value: AKIA23D4RF6OZWGDKV7W
-  - option_name: STRAPI_S3_SECRET_KEY
-    value: "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"
+  # - option_name: STRAPI_S3_ACCESS_KEY
+  #   value: AKIA23D4RF6OZWGDKV7W
+  # - option_name: STRAPI_S3_SECRET_KEY
+  #   value: "4sb/fxewDGjMYLocjclPCWDm7JTBCYuFBjQAbbBR"
   - option_name: STRAPI_S3_REGION
     value: "eu-west-1"
   - option_name: STRAPI_S3_BUCKET
-    value: "elb-example-bucket-cf"
+    value: "prod-strapi-eb-strapi-uploads"
+  - option_name: RDS_HOSTNAME
+    value: prod-strapi-eb.chgwfe43ss59.eu-west-1.rds.amazonaws.com
+  - option_name: RDS_PORT
+    value: 5432
+  - option_name: RDS_NAME
+    value: postgres
+  - option_name: RDS_USERNAME
+    value: mainuser
+  - option_name: RDS_PASSWORD
+    value: password

.ebextensions/05-npm-commands.config

@@ -1,3 +1,4 @@
+# Permanantly disabled
 # container_commands:
 #   installpg:
 #     command: "npm install pg"

.ebextensions/06-https-instance-securitygroup.config

@@ -1,9 +1,10 @@
-Resources:
-  sslSecurityGroupIngress:
-    Type: AWS::EC2::SecurityGroupIngress
-    Properties:
-      GroupId: { "Fn::GetAtt": ["AWSEBSecurityGroup", "GroupId"] }
-      IpProtocol: tcp
-      ToPort: 443
-      FromPort: 443
-      CidrIp: 0.0.0.0/0
+# Done in the Cloudformation 02-stack-vpc.yaml
+# Resources:
+#   sslSecurityGroupIngress:
+#     Type: AWS::EC2::SecurityGroupIngress
+#     Properties:
+#       GroupId: { "Fn::GetAtt": ["AWSEBSecurityGroup", "GroupId"] }
+#       IpProtocol: tcp
+#       ToPort: 443
+#       FromPort: 443
+#       CidrIp: 0.0.0.0/0

.ebextensions/07-custom-vpc.config

@@ -0,0 +1,14 @@
+option_settings:
+  aws:ec2:vpc:
+    VPCId: vpc-016efd8cfbcca99a8
+    Subnets: "subnet-00c0725542e08b1d7,subnet-039fd98ceb88c863c,subnet-0b9fab172a19d818b"
+    # DBSubnets: "subnet-00c0725542e08b1d7,subnet-039fd98ceb88c863c,subnet-0b9fab172a19d818b"
+    # ELBSubnets: "subnet-00c0725542e08b1d7,subnet-039fd98ceb88c863c,subnet-0b9fab172a19d818b"
+  aws:autoscaling:launchconfiguration:
+    SecurityGroups: sg-087f33381c535528b
+  #   aws:elbv2:loadbalancer:
+  #     ManagedSecurityGroup: sg-0e6f91df2ed07050a
+  #     SecurityGroups: sg-0e6f91df2ed07050a
+  aws:autoscaling:asg:
+    MinSize: 1
+    MaxSize: 1

.ebextensions/08-loadbalancer.config

@@ -0,0 +1,4 @@
+# option_settings:
+#   aws:elbv2:listener:443:
+#     Protocol: HTTPS
+#     SSLCertificateArns: arn:aws:acm:eu-west-1:745437999005:certificate/218876af-7f8d-4022-97af-ad982aa540bc