Merge 63f16e6 into 43b5834

LibraryOfCongress · Jan 4, 2019 · dc2b85d · dc2b85d
2 parents 43b5834 + 63f16e6
commit dc2b85d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/cloudformation/infrastructure/network-acl.yaml b/cloudformation/infrastructure/network-acl.yaml
@@ -47,81 +47,81 @@ Resources:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 0.0.0.0/0
-            Egress: 'true'
-            Protocol: "-1"
+            Egress: true
+            Protocol: 1
             RuleAction: allow
-            RuleNumber: '100'
+            RuleNumber: 100
             NetworkAclId: !Ref NetworkAcl
     acl5:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 140.147.236.152/32
-            Protocol: "-1"
+            Protocol: -1
             RuleAction: deny
-            RuleNumber: '10'
+            RuleNumber: 10
             NetworkAclId: !Ref NetworkAcl
     acl6:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 140.147.236.214/32
-            Protocol: "-1"
+            Protocol: -1
             RuleAction: deny
-            RuleNumber: '11'
+            RuleNumber: 11
             NetworkAclId: !Ref NetworkAcl
     acl7:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 140.147.0.0/16
-            Protocol: '6'
+            Protocol: 6
             RuleAction: allow
-            RuleNumber: '100'
+            RuleNumber: 100
             PortRange:
-                From: '22'
-                To: '22'
+                From: 22
+                To: 22
             NetworkAclId:
                 Ref: NetworkAcl
     acl8:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 0.0.0.0/0
-            Protocol: '6'
+            Protocol: 6
             RuleAction: allow
-            RuleNumber: '110'
+            RuleNumber: 110
             PortRange:
-                From: '1024'
-                To: '65535'
+                From: 1024
+                To: 65535
             NetworkAclId:
                 Ref: NetworkAcl
     acl9:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 0.0.0.0/0
-            Protocol: '6'
+            Protocol: 6
             RuleAction: allow
-            RuleNumber: '200'
+            RuleNumber: 200
             PortRange:
-                From: '80'
-                To: '80'
+                From: 80
+                To: 80
             NetworkAclId: !Ref NetworkAcl
     acl10:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 0.0.0.0/0
-            Protocol: '6'
+            Protocol: 6
             RuleAction: allow
-            RuleNumber: '210'
+            RuleNumber: 210
             PortRange:
-                From: '443'
-                To: '443'
+                From: 443
+                To: 443
             NetworkAclId: !Ref NetworkAcl
 
     acl11:
         Type: AWS::EC2::NetworkAclEntry
         Properties:
             CidrBlock: 0.0.0.0/0
-            Protocol: "-1"
+            Protocol: -1
             RuleAction: allow
-            RuleNumber: '300'
+            RuleNumber: 300
             NetworkAclId: !Ref NetworkAcl
 
     subnetacl5:

diff --git a/cloudformation/infrastructure/rds.yaml b/cloudformation/infrastructure/rds.yaml
@@ -30,8 +30,8 @@ Resources:
     Type: AWS::RDS::DBInstance
     Properties:
       AllocatedStorage: '20'
-      AllowMajorVersionUpgrade: 'false'
-      AutoMinorVersionUpgrade: 'true'
+      AllowMajorVersionUpgrade: false
+      AutoMinorVersionUpgrade: true
       DBInstanceClass: db.t2.medium
       Port: '5432'
       PubliclyAccessible: false      

diff --git a/cloudformation/infrastructure/security-groups.yaml b/cloudformation/infrastructure/security-groups.yaml
@@ -25,7 +25,7 @@ Resources:
             GroupDescription: Access to the ECS hosts and the tasks/containers that run on them
             SecurityGroupIngress:
                 - SourceSecurityGroupId: !Ref LoadBalancerSecurityGroup 
-                  IpProtocol: -1
+                  IpProtocol: '-1'
                 - SourceSecurityGroupId: !Ref BastionHostSecurityGroup
                   IpProtocol: tcp
                   FromPort: 22
@@ -56,7 +56,7 @@ Resources:
                 - Key: Name
                   Value: !Sub ${EnvironmentName}-LoadBalancers
                 - Key: AllowCloudFlareIngress
-                  Value: true
+                  Value: 'true'
 
     DatabaseSecurityGroup:
         Type: AWS::EC2::SecurityGroup