update demo setup

3 files changed, 15 insertions, 29 deletions

diff --git a/app/src/custom/assets/ptdemo.bitmask.eip-service.json b/app/src/custom/assets/ptdemo.bitmask.eip-service.json
index 65b84dd0..d804d032 100644
--- a/app/src/custom/assets/ptdemo.bitmask.eip-service.json
+++ b/app/src/custom/assets/ptdemo.bitmask.eip-service.json
@@ -19,45 +19,31 @@
         "filter_dns": false,
         "limited": false,
         "transport": [
-          {
-            "type": "openvpn",
-            "protocols": [
-              "tcp"
-            ],
-            "ports": [
-              "443"
-            ]
+          {"type": "openvpn",
+            "protocols": ["tcp"],
+            "ports": ["443"]
           },
-          {
-            "type": "obfs4",
-            "protocols": [
-              "tcp"
-            ],
-            "options": {
-              "cert": "gZlp9k6br2vn2MLnmjXpNh8D/CrR5wtackwZof/iICv1QzPwkkTUa+7JVOKtPiD0NFwCMw",
-              "iat-mode": "0"
-            },
-            "ports": [
-              "23042"
-            ]
+          {"type": "obfs4",
+            "protocols": ["tcp"],
+            "options": {"cert": "gZlp9k6br2vn2MLnmjXpNh8D/CrR5wtackwZof/iICv1QzPwkkTUa+7JVOKtPiD0NFwCMw", "iat-mode": "0"},
+            "ports": ["23042"]
           }
         ]
       }
     }
   ],
-
   "openvpn_configuration": {
     "auth": "SHA1",
     "cipher": "AES-256-CBC",
     "dev": "tun",
     "keepalive": "10 30",
     "key-direction": "1",
-    "nobind": true,
-    "persist-key": true,
+    "nobind": "True",
+    "persist-key": "True",
     "rcvbuf": "0",
     "sndbuf": "0",
     "tls-cipher": "DHE-RSA-AES128-SHA",
-    "tun-ipv6": true,
+    "tun-ipv6": "True",
     "verb": "3"
   }
 }
\ No newline at end of file
diff --git a/app/src/custom/assets/ptdemo.bitmask.net.json b/app/src/custom/assets/ptdemo.bitmask.net.json
index 54b4d8fd..98afaa54 100644
--- a/app/src/custom/assets/ptdemo.bitmask.net.json
+++ b/app/src/custom/assets/ptdemo.bitmask.net.json
@@ -1,8 +1,8 @@
 {
-  "api_uri": "https://api.demo.bitmask.net:4430",
-  "api_version": "1",
+  "api_uri": "https://leech.demo.bitmask.net:8000",
+  "api_version": "3",
   "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e",
-  "ca_cert_uri": "https://demo.bitmask.net/ca.crt",
+  "ca_cert_uri": "https://leech.demo.bitmask.net:8000/ca.crt",
   "default_language": "en",
   "description": {
     "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
diff --git a/app/src/custom/assets/ptdemo.bitmask.secrets.json b/app/src/custom/assets/ptdemo.bitmask.secrets.json
index acf26365..85900ea3 100644
--- a/app/src/custom/assets/ptdemo.bitmask.secrets.json
+++ b/app/src/custom/assets/ptdemo.bitmask.secrets.json
@@ -1,5 +1,5 @@
 {
   "ca_cert":"-----BEGIN CERTIFICATE-----\nMIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt\nYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v\nYml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw\nFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV\nBAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw\nggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai\ndHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB\n7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84\nCA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+\nznCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4\nMEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4\nlPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0\nbQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl\nDEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB\nlfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy\nYMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw\nXjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE\nMAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w\nDQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl\ncXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY\nk/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj\nRnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG\nhtD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX\nEIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J\naF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l\nmlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK\nG6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co\nJa8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d\n69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e\nyV8e\n-----END CERTIFICATE-----",
-  "cert":"-----BEGIN CERTIFICATE-----\nMIIEbDCCAlSgAwIBAgIRALod300UE8xiHL4EEoIhcXowDQYJKoZIhvcNAQELBQAw\nZjEQMA4GA1UECgwHQml0bWFzazEcMBoGA1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5l\ndDE0MDIGA1UEAwwrQml0bWFzayBSb290IENBIChjbGllbnQgY2VydGlmaWNhdGVz\nIG9ubHkhKTAeFw0xOTA3MjMyMjQ5MzZaFw0xOTA4MjcyMjQ5MzZaMBQxEjAQBgNV\nBAMTCVVOTElNSVRFRDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDS\nujyEVdUUFhGDseh4Jb7HtSgAhgCtEcZwqtcZdqSmt8grSQIelb0YsrX+1/ilffPp\nX3tloKCiv73Ur9fPFyFUgdDuu36aeQTvznHYNZAKbuoDDGfV6zswxSKh7YjMK8IB\nnM290ROl2FZNekh6S0to3pVMSOB5h8nulWB3D/9BeW2cB7XaS88jCZECE+edzw5u\nQ7nhW2F9ndr+0CL6ZLgdTrEOTnyZqTj8YVR4Gq82x3Z+MZNVNuRJz+PK+jpdPIBX\n8+Bxli2JkZmEhIWLA67RCAgmxTUngNb5NUnPtiip+8ABry7zSZX2wFERZkdXpI+v\nUEkYOTyXb4X+PaYZ9vsCAwEAAaNnMGUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM\nMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBSopKH/oCH/thCQqS9YTosheHnCBDAfBgNV\nHSMEGDAWgBSHfhO27FhbFFmofb2bj72ezvmibDANBgkqhkiG9w0BAQsFAAOCAgEA\ngp4Z9U9+l0j+J4yCggyxuGysIrnkS/v2QFpEdqc4uILQjj8usfZBqVhNo+GxFqPx\nCwBh8usYvX1Sxq0LfVTcT/cUXhkMLRvCi+IHWaR011x4Q8N1Ak7rC8Q0O5GnxNd7\n0pfaITAxO1T3uMxa2m3LmKkWlCJNrKh9a5wPd96eAaXCoc+erqddqmQPKXEgIGM3\ng15vPumGvIZUhFB5g8wo6UbFyy8fCWBXUYn72IaMzIBBu4Z+eO1+fokeIxLY78iV\n+WbOld6dp6GMNxG8cxzKTjzcAOmCCdwJk9p1ARS+yrI6Y3Sat1NTc6+W8mM2pSj0\neXsMJuImQotver/rDqpgy9IhvAWRgI8smBXHWrjLNZzdBxF6KaN6z8zm2gXW8EKG\nI/aOBCsokrkQt8xcH4QQ0UjgANhG5ZasNGo8L3pkUrKqPUhtCZJlA2fVtA0LVG0o\naJDT76OxTTVP8F4EHGJRsPo+9swYXGiqDuoOhFXbtX/siU2G9WHL2bLZSGeu9EyP\nzMYFEXh2IuXP/wDN8++QfYLBqjLnj9g0mTS7anEbYVbiGuu3rRLJYqw3LQ+XuH+A\naF6GRT+bofF/Opk57moWwEjtWt40KIOhMYv3+T1cNzlLcrgNEvMwPHcUK7/6ukzv\nF8vICQK6i+exElrH72yWjvckZQlvHjo4bOYIJhZoDtw=\n-----END CERTIFICATE-----",
-  "Constants.PROVIDER_PRIVATE_KEY":"-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAwNK6PIRV1RQWEYOx6Hglvse1KACGAK0RxnCq1xl2pKa3yCtJ\nAh6VvRiytf7X+KV98+lfe2WgoKK/vdSv188XIVSB0O67fpp5BO/Ocdg1kApu6gMM\nZ9XrOzDFIqHtiMwrwgGczb3RE6XYVk16SHpLS2jelUxI4HmHye6VYHcP/0F5bZwH\ntdpLzyMJkQIT553PDm5DueFbYX2d2v7QIvpkuB1OsQ5OfJmpOPxhVHgarzbHdn4x\nk1U25EnP48r6Ol08gFfz4HGWLYmRmYSEhYsDrtEICCbFNSeA1vk1Sc+2KKn7wAGv\nLvNJlfbAURFmR1ekj69QSRg5PJdvhf49phn2+wIDAQABAoIBAHrvHutsV6jE6Jj8\nBJY425+5hYbeZpDRxq5ksJb41gp9fFhzOFXQmBj6QR4FPz54jEfQtx5eGb2wZVyq\n1/1YO9/1F9rUCdfatmNuXIl6lhOigzpQ/TzKRvHy0wyUfnOj8BX9nzIQ3daP+tBz\nDw5cYdrPHnHDNAdhlDArGzNoVVugEDyNb9rR9jSX2Se5ucm1fZkGK8FUTIdDNjr/\nVQyAmAOGwi9CLtMYm0O5xnS/TfMcUAUYfu9ttjL225dAWR9MjYcpODYo3Yzev+dM\nTZ8ka3+3eURXpl08Tl8TPE98jbDqSmm7D0oVrj5jwq/QbAGvAtF1ljJUtHJ52YJ1\nIPGUyoECgYEA5xUowRbje17aXlq9sne4r+f5KqjKDDzCHSwTwFWtfZR60a10uEvI\nRb1CXdEK8L0M7JVXV4J6pOc229/p23O74j5XmaDi/KBce71TGPTBarY/kKyv0xHe\nL59gRcKCfkCWuRFCbKuhGBElEak8tGaGplqljhjUSk+3WC88gLDUS8ECgYEA1Z1y\nfsjcZqkXk1aM6exZUPu0kupU/U2ZtCXcvi40nmyrLyWzMlOljGivGcHGcNAtDv4L\nBGQQt0XP6lo1KqoLT+e1/PbIBEcHCFstgv+LCCrIz4GLNZPHNw8jR09rSC7N4KVj\ncSsbMkjE9Mrxgr5MH0JGnnzVcTf9P8fX1Ejy4bsCgYEAyo6ynacZmmAH3GOAGvt0\nycT2lZ1FFrr/kKC9Y3/2xrirfDamtJHBKNiAX0pJY8LjnFJAMHYwWXJPlSbOkE3/\nqI7rLMBpl/Zdex32xE5vaMH+MCwfJ05nS6lRs3SP/GlTdUAa0LUVTcphivylOKES\ncKnOqyM6mzULSuKFD21xekECgYEAs9wvBFuBYBst04wDeA7eIVbd8vnFd8Y4Dbv3\nglYLTf03oan/mPdfI7sc+/XxbRmLZt02T4slm/r3Fl6/911Xyv7Rd94eCaP4YuvK\nhUs/ODA2BqoPmZwFF/HyBV/0d8GY7Xa0JRxjeNJWq7qY4TnzhDpclaOMYBkBbguJ\nSZ/miXMCgYAVV8THc0ZnjHJEhQZZHyonBA56n6wp8oj7PpSuBOy+oi54Sxds7wJm\ndLOFWeW1a6mlecga3ooIeyd9aa/mb4EXToUkqbSqmcI1ob86mVu9NM2MOxIcsxYR\nu1u8/52sxMv2umwuviWtn1E/vIuRIMKzo077KfZkHq6yiuIrNO+Ruw==\n-----END RSA PRIVATE KEY-----"
+  "cert":"-----BEGIN CERTIFICATE-----\nMIIEbDCCAlSgAwIBAgIRAJ079G+cghukAsL/LV5v4c0wDQYJKoZIhvcNAQELBQAw\nZjEQMA4GA1UECgwHQml0bWFzazEcMBoGA1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5l\ndDE0MDIGA1UEAwwrQml0bWFzayBSb290IENBIChjbGllbnQgY2VydGlmaWNhdGVz\nIG9ubHkhKTAeFw0xOTA4MzAyMTI5MjlaFw0xOTEwMDQyMTI5MjlaMBQxEjAQBgNV\nBAMTCVVOTElNSVRFRDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIy\nF+9n1gvkN3iHO7+wmED6WNhx23/XgYGhP8HrUsI1tu61gPEft/eUfo9yA2zOdZoe\nM3xw8Czj3U2gkpFOrq3VBzyOGeNGGD/yfuwO8/vY9kkubq/Um4S10lznPI1qjktB\nVuY3EJl95lAXmFmYE/ilpPSrRNoi1s4nm08rrW9DOrgEFePAXcz0MkNEMxLxniCo\n85lf0rtjmEJGBibQCrNS4c0jYxOJePXJRX+xfIy6RfRdNesCMglf8uTaRbmx7Nl6\n9XzjAqfOucLhopcSqs8yY87l8M81d25hFHtH1uY0iXxpSbMbTaKSL4QBHRnOUXYs\nAkF5PNqRnV2EQ4cTzIMCAwEAAaNnMGUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM\nMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBTViW4hFR4M7hIHxgXq0DRRzMAatDAfBgNV\nHSMEGDAWgBSHfhO27FhbFFmofb2bj72ezvmibDANBgkqhkiG9w0BAQsFAAOCAgEA\njyXlQ0ltw1B3W0hX+Nf/R7ODdgz4pPL5ZlM0LdOQzyLCGS2Z5tlDT+veaF0dzGAF\nZwkdd93T/Hr0CXnN8eC/YYOv8OKwNXskYt+44tnbS8aRh6rJM/zAHpgcYBaD5hRp\nwidn30Q8ypsm+ge5460eFBXHVo1s+B2tQbmVFy4yZ74hWMt51csGutppQpJ6qK6b\nFYI+vApzCSHRDfFr6oly5pdiLsWult+yJ7S4u2OuvM/BNyfuhB39s+QsAa5ocZbk\njX42puhVAUv717dzTWCeJporMPWGG8fkylXwwIfTpys5pVZtQMdHZmhsaud3sLFe\nyomcWfMpKozCvbdLDn9siLjA76TU8bkCGqNVXZHaVRiConX7yLA7LPpX9+E9uqe1\nEtZLeIir4B0oUXKHqP/8qRGANLH1KaSrAdTWbTUHOCcgjxN3iVYYIg23Ns1xLocK\nfBaUrgxa6KYh+bMtwi5/WDEkjqUv3wPS59JZiHpU2WS0jmgJ0ou16wMzXhN3xHNd\nmScW6cwWKoeSjC3ru1TxB35mxNG32WXZUf6CzYNnCi2gJjYbDvWc75XT9CvNwpAJ\nJsU35MS+uVUPtRK2mX6qg9Qxgjr/SfBHio94lfelUt0QnS2uIoeKpaUxFX1ovbKq\nyhegtT3txnpgaC2zk4t7hl5TdBQ5XN6/QMiOWg37N6s=\n-----END CERTIFICATE-----",
+  "Constants.PROVIDER_PRIVATE_KEY":"-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwjIX72fWC+Q3eIc7v7CYQPpY2HHbf9eBgaE/wetSwjW27rWA\n8R+395R+j3IDbM51mh4zfHDwLOPdTaCSkU6urdUHPI4Z40YYP/J+7A7z+9j2SS5u\nr9SbhLXSXOc8jWqOS0FW5jcQmX3mUBeYWZgT+KWk9KtE2iLWziebTyutb0M6uAQV\n48BdzPQyQ0QzEvGeIKjzmV/Su2OYQkYGJtAKs1LhzSNjE4l49clFf7F8jLpF9F01\n6wIyCV/y5NpFubHs2Xr1fOMCp865wuGilxKqzzJjzuXwzzV3bmEUe0fW5jSJfGlJ\nsxtNopIvhAEdGc5RdiwCQXk82pGdXYRDhxPMgwIDAQABAoIBAQCWdat30RLVic+0\nscqIPbHpfk5B/Q1dIsLzhdTZUZOAZ4/BqZ0qtTGbQFFCoMqojdouO8IWY4aisTWw\nxH1q2fSbOJdvwoWqQo/dU+wkx30gHzzK/I/D6c1I6HsBgiO3SdzPz+MdYYKZ+iLs\n4SsoF505pFWHP/+LpzyY47UAhU3OCoY5xE48Z5OIU/y66zqpiG9ABiYmgb8lYUlc\nzk/EujRZ8G1Q5yC9KSt8SpJNLl3xQvA49BYD1IHSMfICAZjnH0HZ4vx1aOROdyfX\nnq4o7fGjuFJHHa85rf0XxpzhpHPL26oA51Ba0Gh/HxREfmK0gFaSNeUS7eY4HaEl\nHXZesvGRAoGBAOEAiqmPP0RY75Zx1doKxswaZVk8UAI2SYE8wLhGQtGuzqxyEkwH\nXFiKe3FQALiY7sexee5RFySR5tL1ZYlkB7i26jECigQzltAtxBrmx47tnO5g4PPI\nL4xomVE6d65OLW30/TG6FX/CHrJAYKIOteTsCFA9BjBntvTQvMQAJewLAoGBANzz\nDxWpFsvnKWRrvwQunUrPYO3s9MNFE2ak1/gjfBnS/5oBcGY0gUIrsr/qQOP6kQHx\n21gjZsLq0oHW57dQhs+288YS+hOBkP3pW9X8y38sViu9H4qCbn5AByxdhMNzooHQ\n9AFVx7rU7t8o+8YdNwLmKtuut1tzhoML3b/jU3RpAoGAU7xl3nCnNQJ8N9spoTn9\nfhwct7cQd6JIfMZlWq8bUvnhhJ/3W0AqB/GRuzvw6MJRqxPLsvuOx1ddNgmJvjXy\nAbZhNdgiESo56EQABZr5jaG0k6qOTWuk9nY/CNHflIkXsyJH0GfWdHOEBQacb/NV\nklqdRW9QjFcs6bN9bNw5QL0CgYBRiH/whk0bQVpM7FW4vVrd2Fj0c5R+2mamYf4w\nWyfYf7xCoHVRwd5RBL8ZguAfQL9x8EX46FdrZiv4Lc2kH9sfm2uplCckO5O9nvd8\np6SQcVP7H/cbrbYIcKg0/u2XEnzNWsYwF+90Sk87mmwOV4mNUFJQbtDKtn7UrPRP\ncxvAwQKBgD+wKwZWM/yEBaJKHA6XLbKlTrb27bKDBNTt8Pk8BK0uYcZLryIQtZY5\nokyJniA9rv38R5URRAIRwXXDxxIumuWk69CY92dYA5y1tm0ooPG8OFEbSWTBIh74\n3dKEnhNvHVpNQkUd67LlfWsS51YbMCpwqyxI9YPtRwWMGho8R+Ty\n-----END RSA PRIVATE KEY-----"
 }
\ No newline at end of file