Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added support for ipv6 in AWS deployment

Michal Rutka8f7ec4a72581
diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.yml
index 4274da1f2..9cd1bb443 100644
--- a/mvp/aws-cloudformation.template.yml
+++ b/mvp/aws-cloudformation.template.yml
@@ -81,9 +81,19 @@ Resources:
HostedZoneName: !Join [ "", [ !Ref DomainName, "." ] ]
Name: !Join [ ".", [!Ref HostName, !Ref DomainName ] ]
ResourceRecords:
- - !GetAtt EC2Instance.PublicIp
+ - !GetAtt EC2Instance.PublicIp
TTL: '60'
Type: A
+# DNSRecord6:
+# Condition: DnsRecordCreate
+# Type: AWS::Route53::RecordSet
+# Properties:
+# HostedZoneName: !Join [ "", [ !Ref DomainName, "." ] ]
+# Name: !Join [ ".", [!Ref HostName, !Ref DomainName ] ]
+# ResourceRecords:
+# - !GetAtt EC2Instance.PublicIp
+# TTL: '60'
+# Type: AAAA
EC2Instance:
Type: AWS::EC2::Instance
Properties:
@@ -95,6 +105,7 @@ Resources:
Ref: InstanceAMI
SecurityGroups:
- Ref: InstanceSecurityGroup
+ Ipv6AddressCount: 1
Tags:
- Key: "Name"
Value: !Join [ ".", [ !Ref HostName, !Ref DomainName ] ]
@@ -193,4 +204,34 @@ Resources:
FromPort: '8'
ToPort: '-1'
CidrIp: 0.0.0.0/0
+ Description: Ping
+ - IpProtocol: tcp
+ FromPort: '22'
+ ToPort: '22'
+ CidrIpv6: ::/0
+ Description: SSH
+ - IpProtocol: tcp
+ FromPort: '80'
+ ToPort: '80'
+ CidrIpv6: ::/0
+ Description: HTTP
+ - IpProtocol: tcp
+ FromPort: '443'
+ ToPort: '443'
+ CidrIpv6: ::/0
+ Description: HTTPS
+ - IpProtocol: tcp
+ FromPort: '8883'
+ ToPort: '8883'
+ CidrIpv6: ::/0
+ Description: MQTT
+ - IpProtocol: udp
+ FromPort: '161'
+ ToPort: '162'
+ CidrIpv6: ::/0
+ Description: SNMP
+ - IpProtocol: icmpv6
+ FromPort: '8'
+ ToPort: '-1'
+ CidrIpv6: ::/0
Description: Ping
\ No newline at end of file
diff --git a/mvp/fetch_s3_deploy.sh b/mvp/fetch_s3_deploy.sh
index 41bc60c0e..5a11234db 100755
--- a/mvp/fetch_s3_deploy.sh
+++ b/mvp/fetch_s3_deploy.sh
@@ -6,7 +6,6 @@ docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT_NAME openremote/open
echo $AWS_ECR_REPO
docker-compose -p openremote down
docker images --filter "reference=$AWS_ECR_REPO" -q | xargs docker rmi
-sudo rm -rf deployment
docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT_NAME openremote/openremote-cli map -a download -f $DEPLOYMENT_NAME -v -t
sudo tar -xf deployment.tar.gz
sudo mv mapdata.mbtiles deployment/map/ || true