diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-20 18:36:16 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-20 18:36:16 -0600 |
| commit | 195d5ab2d518f6f3960edd3c636e941830c2664d (patch) | |
| tree | 81b6b0d0e0b374e82afa6fc15c32716f981f0aa4 /assets | |
| parent | 5a7e2365365a3b1f773212cefdeeaa4ee587a590 (diff) | |
| parent | 3f8e2f6569f893a49bf1819416cae792c702d370 (diff) | |
Merge 'parmegv/feature/authGui' into develop
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/providers/bitmask.net_provider.json | 25 | ||||
| -rw-r--r-- | assets/urls/bitmask.url | 2 |
2 files changed, 1 insertions, 26 deletions
diff --git a/assets/providers/bitmask.net_provider.json b/assets/providers/bitmask.net_provider.json deleted file mode 100644 index d61be196..00000000 --- a/assets/providers/bitmask.net_provider.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "api_uri": "https://api.bitmask.net:4430", - "api_version": "1", - "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e", - "ca_cert_uri": "https://bitmask.net/ca.crt", - "default_language": "en", - "description": { - "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών.", - "en": "Bitmask is a project of LEAP with the purpose to test the performance and reliability of the LEAP software. Bitmask runs on the latest bleeding edge of the LEAP code, and will likely have more features and less reliability than other service providers.", - "es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios." - }, - "domain": "bitmask.net", - "enrollment_policy": "open", - "languages": [ - "el", - "en", - "es" - ], - "name": { - "en": "Bitmask" - }, - "services": [ - "openvpn" - ] -}
\ No newline at end of file diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url index 910f0400..a17a5ff8 100644 --- a/assets/urls/bitmask.url +++ b/assets/urls/bitmask.url @@ -1,7 +1,7 @@ {
"name" : "bitmask",
"assets_json_provider" : "providers/bitmask.net_provider.json",
- "json_provider" : "https://bitmask.net/provider.json",
+ "provider_json_url" : "https://bitmask.net/provider.json",
"cert" : "https://bitmask.net/ca.crt",
"json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json"
}
\ No newline at end of file |