Skip to content

Commit c75db4f

Browse files
nickysemenzanickysemenza
authored
Merge pull request #1156 from mayocream/master
format json indent
2 parents a538700 + d103ea1 commit c75db4f

File tree

7 files changed

+174
-172
lines changed

7 files changed

+174
-172
lines changed

‎transport/example/ca.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
2-
"hosts": [
3-
"dropsonde.net"
4-
],
5-
"key": {
6-
"algo": "rsa",
7-
"size": 4096
8-
},
9-
"names": [{
10-
"C": "US",
11-
"L": "San Francisco",
12-
"OU": "Dropsonde Certificate Authority",
13-
"ST": "California"
14-
}]
2+
"hosts": [
3+
"dropsonde.net"
4+
],
5+
"key": {
6+
"algo": "rsa",
7+
"size": 4096
8+
},
9+
"names": [
10+
{
11+
"C": "US",
12+
"L": "San Francisco",
13+
"OU": "Dropsonde Certificate Authority",
14+
"ST": "California"
15+
}
16+
]
1517
}

‎transport/example/config.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
2-
"signing": {
3-
"default": {
4-
"expiry": "168h"
5-
},
6-
"profiles": {
7-
"client": {
8-
"expiry": "1h",
9-
"usages": [
10-
"signing",
11-
"key encipherment",
12-
"client auth"
13-
]
14-
},
15-
"server": {
16-
"expiry": "1h",
17-
"usages": [
18-
"signing",
19-
"key encipherment",
20-
"server auth"
21-
]
22-
}
23-
}
2+
"signing": {
3+
"default": {
4+
"expiry": "168h"
5+
},
6+
"profiles": {
7+
"client": {
8+
"expiry": "1h",
9+
"usages": [
10+
"signing",
11+
"key encipherment",
12+
"client auth"
13+
]
14+
},
15+
"server": {
16+
"expiry": "1h",
17+
"usages": [
18+
"signing",
19+
"key encipherment",
20+
"server auth"
21+
]
22+
}
2423
}
24+
}
2525
}

‎transport/example/config_auth.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
{
2-
"auth_keys": {
3-
"client": {
4-
"type": "standard",
5-
"key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
6-
},
7-
"server": {
8-
"type": "standard",
9-
"key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
10-
}
2+
"auth_keys": {
3+
"client": {
4+
"type": "standard",
5+
"key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
116
},
12-
"signing": {
13-
"default": {
14-
"expiry": "168h"
15-
},
16-
"profiles": {
17-
"client": {
18-
"auth_key": "client",
19-
"expiry": "1h",
20-
"usages": [
21-
"signing",
22-
"key encipherment",
23-
"client auth"
24-
]
25-
},
26-
"server": {
27-
"auth_key": "server",
28-
"expiry": "8760h",
29-
"usages": [
30-
"signing",
31-
"key encipherment",
32-
"server auth"
33-
]
34-
}
35-
}
7+
"server": {
8+
"type": "standard",
9+
"key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
3610
}
11+
},
12+
"signing": {
13+
"default": {
14+
"expiry": "168h"
15+
},
16+
"profiles": {
17+
"client": {
18+
"auth_key": "client",
19+
"expiry": "1h",
20+
"usages": [
21+
"signing",
22+
"key encipherment",
23+
"client auth"
24+
]
25+
},
26+
"server": {
27+
"auth_key": "server",
28+
"expiry": "8760h",
29+
"usages": [
30+
"signing",
31+
"key encipherment",
32+
"server auth"
33+
]
34+
}
35+
}
36+
}
3737
}

‎transport/example/maclient/client.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"request": {
3-
"CN": "test client",
4-
"hosts": ["127.0.0.1"]
2+
"request": {
3+
"CN": "test client",
4+
"hosts": ["127.0.0.1"]
5+
},
6+
"profiles": {
7+
"paths": {
8+
"private_key": "client.key",
9+
"certificate": "client.pem"
510
},
6-
"profiles": {
7-
"paths": {
8-
"private_key": "client.key",
9-
"certificate": "client.pem"
10-
},
11-
"cfssl": {
12-
"profile": "client",
13-
"remote": "127.0.0.1:8888"
14-
}
11+
"cfssl": {
12+
"profile": "client",
13+
"remote": "127.0.0.1:8888"
14+
}
15+
},
16+
"roots": [
17+
{
18+
"type": "system"
1519
},
16-
"roots": [
17-
{
18-
"type": "system"
19-
},
20-
{
21-
"type": "cfssl",
22-
"metadata": {
23-
"host": "127.0.0.1:8888",
24-
"profile": "server"
25-
}
26-
}
27-
]
20+
{
21+
"type": "cfssl",
22+
"metadata": {
23+
"host": "127.0.0.1:8888",
24+
"profile": "server"
25+
}
26+
}
27+
]
2828
}

‎transport/example/maclient/client_auth.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"request": {
3-
"CN": "test client",
4-
"hosts": ["127.0.0.1"]
2+
"request": {
3+
"CN": "test client",
4+
"hosts": ["127.0.0.1"]
5+
},
6+
"profiles": {
7+
"paths": {
8+
"private_key": "client.key",
9+
"certificate": "client.pem"
510
},
6-
"profiles": {
7-
"paths": {
8-
"private_key": "client.key",
9-
"certificate": "client.pem"
10-
},
11-
"cfssl": {
12-
"profile": "client",
13-
"remote": "127.0.0.1:8888",
14-
"auth-type": "standard",
15-
"auth-key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
16-
}
11+
"cfssl": {
12+
"profile": "client",
13+
"remote": "127.0.0.1:8888",
14+
"auth-type": "standard",
15+
"auth-key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
16+
}
17+
},
18+
"roots": [
19+
{
20+
"type": "system"
1721
},
18-
"roots": [
19-
{
20-
"type": "system"
21-
},
22-
{
23-
"type": "cfssl",
24-
"metadata": {
25-
"host": "127.0.0.1:8888",
26-
"profile": "server"
27-
}
28-
}
29-
]
22+
{
23+
"type": "cfssl",
24+
"metadata": {
25+
"host": "127.0.0.1:8888",
26+
"profile": "server"
27+
}
28+
}
29+
]
3030
}

‎transport/example/maserver/server.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
"request": {
3-
"CN": "test server",
4-
"hosts": [
5-
"127.0.0.1"
6-
]
7-
},
8-
"profiles": {
9-
"paths": {
10-
"private_key": "server.key",
11-
"certificate": "server.pem"
12-
},
13-
"cfssl": {
14-
"profile": "server",
15-
"remote": "127.0.0.1:8888"
16-
}
17-
},
18-
"roots": [
19-
{
20-
"type": "system"
21-
}
22-
],
23-
"client_roots": [
24-
{
25-
"type": "cfssl",
26-
"metadata": {
27-
"host": "127.0.0.1:8888",
28-
"profile": "maclient"
29-
}
30-
}
2+
"request": {
3+
"CN": "test server",
4+
"hosts": [
5+
"127.0.0.1"
316
]
7+
},
8+
"profiles": {
9+
"paths": {
10+
"private_key": "server.key",
11+
"certificate": "server.pem"
12+
},
13+
"cfssl": {
14+
"profile": "server",
15+
"remote": "127.0.0.1:8888"
16+
}
17+
},
18+
"roots": [
19+
{
20+
"type": "system"
21+
}
22+
],
23+
"client_roots": [
24+
{
25+
"type": "cfssl",
26+
"metadata": {
27+
"host": "127.0.0.1:8888",
28+
"profile": "maclient"
29+
}
30+
}
31+
]
3232
}

‎transport/example/maserver/server_auth.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"request": {
3-
"CN": "test server",
4-
"hosts": ["127.0.0.1"]
2+
"request": {
3+
"CN": "test server",
4+
"hosts": ["127.0.0.1"]
5+
},
6+
"profiles": {
7+
"paths": {
8+
"private_key": "server.key",
9+
"certificate": "server.pem"
510
},
6-
"profiles": {
7-
"paths": {
8-
"private_key": "server.key",
9-
"certificate": "server.pem"
10-
},
11-
"cfssl": {
12-
"profile": "server",
13-
"remote": "127.0.0.1:8888",
14-
"auth-type": "standard",
15-
"auth-key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
16-
}
17-
},
18-
"roots": [{
19-
"type": "system"
20-
}],
21-
"client_roots": [{
22-
"type": "cfssl",
23-
"metadata": {
24-
"host": "127.0.0.1:8888",
25-
"profile": "client"
26-
}
27-
}]
11+
"cfssl": {
12+
"profile": "server",
13+
"remote": "127.0.0.1:8888",
14+
"auth-type": "standard",
15+
"auth-key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
16+
}
17+
},
18+
"roots": [{
19+
"type": "system"
20+
}],
21+
"client_roots": [{
22+
"type": "cfssl",
23+
"metadata": {
24+
"host": "127.0.0.1:8888",
25+
"profile": "client"
26+
}
27+
}]
2828
}

0 commit comments

Comments
 (0)