Compare commits

..

No commits in common. "0ca69d099421bb79d867b92bb8c0dab26e9f94e1" and "c12c004fed20ca9cc99539e368c0f1708f678ad3" have entirely different histories.

2 changed files with 11 additions and 11 deletions

View File

@ -240,37 +240,37 @@ provider.wowza {
# clip storage & cloudfront # clip storage & cloudfront
clip.storage.bucket = "/mkfleet/clip/" clip.storage.bucket = "/mkfleet/clip/"
clip.storage.address { clip.storage.address {
default = "http://minio.cmc.eveus.com/mkfleet/clip/" default = "https://minio.cmc.eveus.com/mkfleet/clip/"
} }
# streaming storage & cloudfront # streaming storage & cloudfront
streaming.storage.bucket = "/mkfleet/live_video/" streaming.storage.bucket = "/mkfleet/live_video/"
streaming.storage.address { streaming.storage.address {
default = "http://minio.cmc.eveus.com/mkfleet/live_video/" default = "https://minio.cmc.eveus.com/mkfleet/live_video/"
} }
# firmware storage & cloudfront # firmware storage & cloudfront
firmware.storage.bucket= "/mkfleet/firmware" firmware.storage.bucket= "/mkfleet/firmware"
firmware.storage.address { firmware.storage.address {
default = "http://minio.cmc.eveus.com/mkfleet/firmware/" default = "https://minio.cmc.eveus.com/mkfleet/firmware/"
} }
# gpsReport.storage cloudfront # gpsReport.storage cloudfront
gpsReport.storage.address { gpsReport.storage.address {
default = "http://minio.cmc.eveus.com/mkfleet/gps_data_report/" default = "https://minio.cmc.eveus.com/mkfleet/gps_data_report/"
} }
# fleetReport.storage cloudfront # fleetReport.storage cloudfront
fleetReport.storage.address { fleetReport.storage.address {
default = "http://minio.cmc.eveus.com/mkfleet/fleet_report/" default = "https://minio.cmc.eveus.com/mkfleet/fleet_report/"
} }
# log storage cloudfront # log storage cloudfront
log.storage.address = "http://minio.cmc.eveus.com/mkfleet/log/" log.storage.address = "https://minio.cmc.eveus.com/mkfleet/log/"
# audio storage & cloudfront # audio storage & cloudfront
audio.storage.bucket="mkfleet" audio.storage.bucket="mkfleet"
audio.storage.address="http://minio.cmc.eveus.com/mkfleet/audio/" audio.storage.address="https://minio.cmc.eveus.com/mkfleet/audio/"
clip.request.pendingTimeout = 604800 clip.request.pendingTimeout = 604800

View File

@ -283,12 +283,12 @@
</Property> </Property>
<Property> <Property>
<Name>s3UploadAccessKeyID</Name> <Name>s3UploadAccessKeyID</Name>
<Value>0YSQr57jQNAj8iX6</Value> <Value>fTbjUPzlfsxlue0O</Value>
<Type>String</Type> <Type>String</Type>
</Property> </Property>
<Property> <Property>
<Name>s3UploadAccessKeySecret</Name> <Name>s3UploadAccessKeySecret</Name>
<Value>l3j0x1UpCmcu8tNYp2WkArjYY1sQdU7U</Value> <Value>Gf6xyQie5QDH28y41f4mXuDzvez26cWg</Value>
<Type>String</Type> <Type>String</Type>
</Property> </Property>
<Property> <Property>
@ -298,12 +298,12 @@
</Property> </Property>
<Property> <Property>
<Name>s3UploadRegion</Name> <Name>s3UploadRegion</Name>
<Value>vn-hanoi-1</Value> <Value>cn-qingdao-1</Value>
<Type>String</Type> <Type>String</Type>
</Property> </Property>
<Property> <Property>
<Name>s3UploadHost</Name> <Name>s3UploadHost</Name>
<Value>http://172.16.88.129:9000</Value> <Value>http://172.16.88.19:9000</Value>
<Type>String</Type> <Type>String</Type>
</Property> </Property>
<Property> <Property>