From da6ffc05f371ca7a461a120e680db5116d46fbf1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 2 Dec 2014 09:21:36 -0500 Subject: standardize json formatting --- common.json | 8 +++--- facts.json | 72 +++++++++++++++++++++++------------------------ provider.demo.json | 22 +++++++-------- provider.development.json | 12 ++++---- provider.json | 40 +++++++++++++------------- provider.unstable.json | 12 ++++---- 6 files changed, 83 insertions(+), 83 deletions(-) diff --git a/common.json b/common.json index b991b29..4e9d7e8 100644 --- a/common.json +++ b/common.json @@ -2,9 +2,9 @@ // Options put here are inherited by all nodes. // { - "ssh": { - "mosh": { - "enabled": true + "ssh": { + "mosh": { + "enabled": true + } } - } } diff --git a/facts.json b/facts.json index 22ec62b..9ed6c58 100644 --- a/facts.json +++ b/facts.json @@ -1,38 +1,38 @@ { - "canvasback": { - "ec2_local_ipv4": "192.168.4.10", - "ec2_public_ipv4": "192.168.5.4" - }, - "chameleon": { - "ec2_local_ipv4": "192.168.4.17", - "ec2_public_ipv4": "192.168.5.10" - }, - "chipmonk": { - "ec2_local_ipv4": "192.168.4.4", - "ec2_public_ipv4": "192.168.5.19" - }, - "frog": { - "ec2_local_ipv4": "192.168.4.12", - "ec2_public_ipv4": "192.168.5.23" - }, - "gadwall": { - "ec2_local_ipv4": "192.168.4.20", - "ec2_public_ipv4": "192.168.5.5" - }, - "ladybug": { - "ec2_local_ipv4": "192.168.4.2", - "ec2_public_ipv4": "192.168.5.8" - }, - "octopus": { - "ec2_local_ipv4": "192.168.4.21", - "ec2_public_ipv4": "192.168.5.16" - }, - "panda": { - "ec2_local_ipv4": "192.168.4.19", - "ec2_public_ipv4": "192.168.5.9" - }, - "seahorse": { - "ec2_local_ipv4": "192.168.4.18", - "ec2_public_ipv4": "192.168.5.12" - } + "canvasback": { + "ec2_local_ipv4": "192.168.4.10", + "ec2_public_ipv4": "192.168.5.4" + }, + "chameleon": { + "ec2_local_ipv4": "192.168.4.17", + "ec2_public_ipv4": "192.168.5.10" + }, + "chipmonk": { + "ec2_local_ipv4": "192.168.4.4", + "ec2_public_ipv4": "192.168.5.19" + }, + "frog": { + "ec2_local_ipv4": "192.168.4.12", + "ec2_public_ipv4": "192.168.5.23" + }, + "gadwall": { + "ec2_local_ipv4": "192.168.4.20", + "ec2_public_ipv4": "192.168.5.5" + }, + "ladybug": { + "ec2_local_ipv4": "192.168.4.2", + "ec2_public_ipv4": "192.168.5.8" + }, + "octopus": { + "ec2_local_ipv4": "192.168.4.21", + "ec2_public_ipv4": "192.168.5.16" + }, + "panda": { + "ec2_local_ipv4": "192.168.4.19", + "ec2_public_ipv4": "192.168.5.9" + }, + "seahorse": { + "ec2_local_ipv4": "192.168.4.18", + "ec2_public_ipv4": "192.168.5.12" + } } diff --git a/provider.demo.json b/provider.demo.json index dd2b26c..2a06c17 100644 --- a/provider.demo.json +++ b/provider.demo.json @@ -1,13 +1,13 @@ { - "description": { - "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", - "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", - "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted." - }, - "languages": ["en"], - "services": ["openvpn"], - "service": { - "allow_anonymous": true, - "levels": {} - } + "description": { + "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", + "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", + "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted." + }, + "languages": ["en"], + "services": ["openvpn"], + "service": { + "allow_anonymous": true, + "levels": {} + } } diff --git a/provider.development.json b/provider.development.json index 9a14f61..ac6ac8e 100644 --- a/provider.development.json +++ b/provider.development.json @@ -1,8 +1,8 @@ { - "service": { - "allow_anonymous": false - }, - "platform": { - "branch": "develop" - } + "service": { + "allow_anonymous": false + }, + "platform": { + "branch": "develop" + } } diff --git a/provider.json b/provider.json index ae8ec87..ad97560 100644 --- a/provider.json +++ b/provider.json @@ -2,25 +2,25 @@ // General service provider configuration. // { - "domain": "bitmask.net", - "name": { - "en": "Bitmask" - }, - "description": { - "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.", - "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών." - }, - "languages": ["en", "es", "el"], - "default_language": "en", - "enrollment_policy": "open", - "contacts": { - "default": "sysdev@leap.se" - }, - "ca": { - "server_certificates": { -// not support by gandi: -// "bit_size": 3248 + "domain": "bitmask.net", + "name": { + "en": "Bitmask" + }, + "description": { + "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.", + "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών." + }, + "languages": ["en", "es", "el"], + "default_language": "en", + "enrollment_policy": "open", + "contacts": { + "default": "sysdev@leap.se" + }, + "ca": { + "server_certificates": { + // not support by gandi: + // "bit_size": 3248 + } } - } } diff --git a/provider.unstable.json b/provider.unstable.json index 82d1138..0ed00b0 100644 --- a/provider.unstable.json +++ b/provider.unstable.json @@ -1,8 +1,8 @@ { - "service": { - "allow_anonymous": false -// }, -//"platform": { -// "branch": "develop" - } + "service": { + "allow_anonymous": false + // }, + //"platform": { + // "branch": "develop" + } } -- cgit v1.2.3