abandon supervisord in favor of compose

aibitcat · Jul 12, 2017 · e695b62 · e695b62
1 parent db7634b
commit e695b62
Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/cloudformation/us-west-2.yml b/cloudformation/us-west-2.yml
@@ -236,8 +236,8 @@ Resources:
     DependsOn: ApplicationLoadBalancer
     Properties:
       HealthyThresholdCount: 2
-      HealthCheckIntervalSeconds: 30
-      UnhealthyThresholdCount: 5
+      HealthCheckIntervalSeconds: 10
+      UnhealthyThresholdCount: 2
       HealthCheckPath: /health
       HealthCheckPort: 80
       Name: DashboardWebServers
@@ -248,6 +248,23 @@ Resources:
       Tags:
         - Key: Name
           Value: SSO-Dashboard
+  ALBTargetGroup1:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    DependsOn: ApplicationLoadBalancer
+    Properties:
+      HealthyThresholdCount: 2
+      HealthCheckIntervalSeconds: 10
+      UnhealthyThresholdCount: 2
+      HealthCheckPath: /health
+      HealthCheckPort: 80
+      Name: DashboardContentDelivery
+      Port: 80
+      Protocol: HTTP
+      VpcId:
+        Ref: SSODashboardVPC
+      Tags:
+        - Key: Name
+          Value: SSO-Dashboard
   SSODashboardLaunchConfigProd:
     Type: "AWS::AutoScaling::LaunchConfiguration"
     Condition: UseProdCondition
@@ -265,6 +282,7 @@ Resources:
             - yum update -y
             - yum install ruby wget -y
             - cd /home/ec2-user
+            - pip install boto3 --upgrade
             - wget https://aws-codedeploy-$REGION.s3.amazonaws.com/latest/install
             - chmod +x ./install
             - ./install auto
@@ -301,6 +319,7 @@ Resources:
             - yum update -y
             - yum install ruby wget -y
             - cd /home/ec2-user
+            - pip install boto3 --upgrade
             - wget https://aws-codedeploy-$REGION.s3.amazonaws.com/latest/install
             - chmod +x ./install
             - ./install auto
@@ -318,6 +337,20 @@ Resources:
       SecurityGroups:
         - Ref: SSODashboardSecGroup
       InstanceType: "t2.medium"
+  ListenerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+      - Type: forward
+        TargetGroupArn:
+          Ref: ALBTargetGroup1
+      Conditions:
+      - Field: path-pattern
+        Values:
+        - "/static/*"
+      ListenerArn:
+        Ref: ALBHTTPSListener
+      Priority: 1
   SSODashboardASG:
     Type: "AWS::AutoScaling::AutoScalingGroup"
     DependsOn: [ SSODashboardSubnet1, SSODashboardSubnet2, SSODashboardSubnet3 ]
@@ -333,6 +366,7 @@ Resources:
           PropagateAtLaunch: true
       TargetGroupARNs:
          - Ref: ALBTargetGroup
+         - Ref: ALBTargetGroup1
       MaxSize: "5"
       MinSize: "3"
       VPCZoneIdentifier:

diff --git a/conf/supervisor-ansible.ini b/conf/supervisor-ansible.ini
diff --git a/scripts/post-deploy.sh b/scripts/post-deploy.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-/etc/init.d/supervisord start
+cd /home/ec2-user/app
+/usr/local/bin/docker-compose up -d
diff --git a/scripts/prep-deploy.sh b/scripts/prep-deploy.sh
@@ -6,8 +6,6 @@ cd /home/ec2-user/app
 /usr/local/bin/docker-compose stop
 /usr/local/bin/docker-compose rm -f
 
-cp /home/ec2-user/app/conf/supervisor-ansible.ini /etc/supervisord.d/
-
 rm -rf /home/ec2-user/app
 
 mkdir -p /home/ec2-user/app