From e132676d2950c80c5e7c2b75cb5aafc795b1c694 Mon Sep 17 00:00:00 2001
From: Wahaj Dar <mail@wahajdar.com>
Date: Tue, 24 Mar 2020 16:00:05 +0500
Subject: [PATCH] rtmp-services: Update castr.io rtmp ingest list

Closes #2559
---
 plugins/rtmp-services/data/package.json  |  4 +-
 plugins/rtmp-services/data/services.json | 76 ++++++++++++------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index 4fd285524..db9e5f1ee 100644
--- a/plugins/rtmp-services/data/package.json
+++ b/plugins/rtmp-services/data/package.json
@@ -1,10 +1,10 @@
 {
 	"url": "https://obsproject.com/obs2_update/rtmp-services",
-	"version": 126,
+	"version": 127,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 126
+			"version": 127
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index 3cadffc05..76169d36c 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -893,57 +893,61 @@
             "name": "Castr.io",
             "servers": [
                 {
-                    "name": "Chicago US",
+                    "name": "US-East (Chicago, IL)",
                     "url": "rtmp://cg.castr.io/static"
                 },
                 {
-                    "name": "Los Angeles US",
-                    "url": "rtmp://la.castr.io/static"
-                },
-                {
-                    "name": "New York US",
+                    "name": "US-East (New York, NY)",
                     "url": "rtmp://ny.castr.io/static"
                 },
                 {
-                    "name": "Miami US",
+                    "name": "US-East (Miami, FL)",
                     "url": "rtmp://mi.castr.io/static"
                 },
                 {
-                    "name": "Montreal CA",
+                    "name": "US-West (Seattle, WA)",
+                    "url": "rtmp://se.castr.io/static"
+                },
+                {
+                    "name": "US-West (Los Angeles, CA)",
+                    "url": "rtmp://la.castr.io/static"
+                },
+                {
+                    "name": "US-Central (Dallas, TX)",
+                    "url": "rtmp://da.castr.io/static"
+                },
+                {
+                    "name": "NA-East (Toronto, CA)",
                     "url": "rtmp://qc.castr.io/static"
                 },
                 {
-                    "name": "London UK",
-                    "url": "rtmp://uk.castr.io/static"
-                },
-                {
-                    "name": "Frankfurt DE",
-                    "url": "rtmp://de.castr.io/static"
-                },
-                {
-                    "name": "Frankfurt DE 2",
-                    "url": "rtmp://fr.castr.io/static"
-                },
-                {
-                    "name": "Moscow RU",
-                    "url": "rtmp://ru.castr.io/static"
-                },
-                {
-                    "name": "Singapore",
-                    "url": "rtmp://sg.castr.io/static"
-                },
-                {
-                    "name": "Sydney AU",
-                    "url": "rtmp://au.castr.io/static"
-                },
-                {
-                    "name": "Brazil",
+                    "name": "SA (Sao Paulo, BR)",
                     "url": "rtmp://br.castr.io/static"
                 },
                 {
-                    "name": "India",
+                    "name": "EU-West (London, UK)",
+                    "url": "rtmp://uk.castr.io/static"
+                },
+                {
+                    "name": "EU-Central (Frankfurt, DE)",
+                    "url": "rtmp://fr.castr.io/static"
+                },
+                {
+                    "name": "Russia (Moscow)",
+                    "url": "rtmp://ru.castr.io/static"
+                },
+                {
+                    "name": "Asia (Singapore)",
+                    "url": "rtmp://sg.castr.io/static"
+                },
+                {
+                    "name": "Asia (India)",
                     "url": "rtmp://in.castr.io/static"
                 },
+                {
+                    "name": "Australia (Sydney)",
+                    "url": "rtmp://au.castr.io/static"
+                },
                 {
                     "name": "US Central",
                     "url": "rtmp://us-central.castr.io/static"
@@ -975,10 +979,6 @@
                 {
                     "name": "Singapore",
                     "url": "rtmp://sg-central.castr.io/static"
-                },
-                {
-                    "name": "India",
-                    "url": "rtmp://in.castr.io/static"
                 }
             ],
             "recommended": {