100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
CI/CD: minor
Rich Turner8903c966b615
diff --git a/.ci_cd/aws/cloudformation-create-ec2.yml b/.ci_cd/aws/cloudformation-create-ec2.ymlindex 72003f46b..222479638 100644--- a/.ci_cd/aws/cloudformation-create-ec2.yml+++ b/.ci_cd/aws/cloudformation-create-ec2.yml@@ -160,8 +160,7 @@ Resources:configSets:default:- 01_setupCfnHup- - 02_config-amazon-cloudwatch-agent- - 03_restart_amazon-cloudwatch-agent+ - 02_restart_amazon-cloudwatch-agent- docker_setup- cron_setup- env_vars@@ -170,9 +169,6 @@ Resources:- s3_backup_service- deployment_local_dir- daily_cleanup- UpdateEnvironment:- - 02_config-amazon-cloudwatch-agent- - 03_restart_amazon-cloudwatch-agentdaily_cleanup:files:@@ -268,8 +264,9 @@ Resources:exit 0fi- echo "Running DNS A record update"- PUBLIC_IP=$(curl ident.me)+ echo "Running DNS record update"+ PUBLIC_IPV4=$(curl v4.ident.me 2>/dev/null)+ PUBLIC_IPV6=$(curl v6.ident.me 2>/dev/null)if [ -n "${DNSHostedZoneRoleArn}" ]; thenecho "Assuming role '${DNSHostedZoneRoleArn}' for DNS A record update"@@ -295,21 +292,55 @@ Resources:read -r -d '' RECORDSET << EOF{- "Comment": "Creating NS record for '${Host}' subdomain",+ "Comment": "Creating NS record(s) for '${Host}' subdomain","Changes": [+ EOF++ if [ -n "$PUBLIC_IPV4" ]; then++ read -r -d '' RECORDSET << EOF+ $RECORDSET{"Action": "UPSERT","ResourceRecordSet": {"Name": "${Host}.","Type": "A","TTL": 300,- "ResourceRecords": [{ "Value": "$PUBLIC_IP"}]+ "ResourceRecords": [{ "Value": "$PUBLIC_IPV4"}]+ }+ }+ EOF++ fi+++ if [ -n "$PUBLIC_IPV6" ]; then++ if [ -n "$PUBLIC_IPV4" ]; then+ RECORDSET="$RECORDSET,"+ fi++ read -r -d '' RECORDSET << EOF+ $RECORDSET+ {+ "Action": "UPSERT",+ "ResourceRecordSet": {+ "Name": "${Host}.",+ "Type": "AAAA",+ "TTL": 300,+ "ResourceRecords": [{ "Value": "$PUBLIC_IPV6"}]}}+ EOF+ fi++ read -r -d '' RECORDSET << EOF+ $RECORDSET]}EOF-++ echo "$RECORDSET"aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch "$RECORDSET""/lib/systemd/system/dns-updater.service":diff --git a/.ci_cd/deploy.sh b/.ci_cd/deploy.shindex 0bd89cae8..48ad94344 100644--- a/.ci_cd/deploy.sh+++ b/.ci_cd/deploy.sh@@ -274,7 +274,7 @@ elif [ -f "temp/host_init/init.sh" ]; thenfiif [ -n "\$hostInitCmd" ]; thenecho "Running host init script: '\$hostInitCmd'"- sudo \$hostInitCmd+ sudo -E \$hostInitCmdelseecho "No host init script"fi@@ -333,7 +333,7 @@ elif [ -f "temp/host_init/post_init.sh" ]; thenfiif [ -n "\$hostPostInitCmd" ]; thenecho "Running host post init script: '\$hostPostInitCmd'"- sudo \$hostPostInitCmd+ sudo -E \$hostPostInitCmdelseecho "No host post init script"fi@@ -409,7 +409,7 @@ elif [ -f "temp/host_init/init.sh" ]; thenfiif [ -n "\$hostInitCmd" ]; thenecho "Running host init script: '\$hostInitCmd'"- sudo \$hostInitCmd+ sudo -E \$hostInitCmdelseecho "No host init script"fi@@ -468,7 +468,7 @@ elif [ -f "temp/host_init/post_init.sh" ]; thenfiif [ -n "\$hostPostInitCmd" ]; thenecho "Running host post init script: '\$hostPostInitCmd'"- sudo \$hostPostInitCmd+ sudo -E \$hostPostInitCmdelseecho "No host post init script"fi