Skip to content

Commit

Permalink
Add trailing commas in example config files
Browse files Browse the repository at this point in the history
  • Loading branch information
progval authored and spb committed Aug 26, 2023
1 parent f60196f commit c2c9321
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 46 deletions.
4 changes: 2 additions & 2 deletions configs/config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"node_config": {
"listen_addr": "127.0.1.254:6668",
"cert_file": "configs/config.pem",
"key_file": "configs/config.key"
"key_file": "configs/config.key",
}
}
}
2 changes: 1 addition & 1 deletion configs/network.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"peers": [
{ "name": "server1.test", "address": "127.0.1.2:6668", "fingerprint": "961090b178e037be12a77c0a83876740e3222abd" },
{ "name": "server2.test", "address": "127.0.1.3:6668", "fingerprint": "000fd90df3da5619563eb49228229ac410acc09c" },
{ "name": "services.test", "address": "127.0.1.4:6668", "fingerprint": "95806a3b9b14d0bf47521368d9d1f13a5df89cde" }
{ "name": "services.test", "address": "127.0.1.4:6668", "fingerprint": "95806a3b9b14d0bf47521368d9d1f13a5df89cde" },
]
}
29 changes: 14 additions & 15 deletions configs/server1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"address": "127.0.1.2:8888",
"client_ca": "configs/ca_cert.pem",
"authorised_fingerprints": [
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" }
]
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
],
},

"server": {
"listeners": [
{ "address": "127.0.1.2:6667" },
{ "address": "127.0.1.2:6697", "tls": true }
{ "address": "127.0.1.2:6697", "tls": true },
]
},

"tls_config": {
"key_file": "configs/server1.key",
"cert_file": "configs/server1.pem"
"cert_file": "configs/server1.pem",
},

"node_config": {
"listen_addr": "127.0.1.2:6668",
"cert_file": "configs/server1.pem",
"key_file": "configs/server1.key"
"key_file": "configs/server1.key",
},

"log": {
Expand All @@ -52,25 +52,24 @@
{
"target": "stdout",
"level": "trace",
"modules": [ "sable", "audit" ]
"modules": [ "sable", "audit" ],
},
{
"target": { "filename": "sable.log" },
"level": "info"
"level": "info",
},
{
"target": { "filename": "audit.log" },
"category": "audit",
"level": "info"
}
,
"level": "info",
},
{
"target": { "filename": "trace.log" },
"level": "trace"
}
"level": "trace",
},

]
],

, "console-address": "127.0.1.2:9999"
}
"console-address": "127.0.1.2:9999",
},
}
29 changes: 14 additions & 15 deletions configs/server2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"address": "127.0.1.3:8888",
"client_ca": "configs/ca_cert.pem",
"authorised_fingerprints": [
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" }
]
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
],
},

"server": {
Expand All @@ -18,13 +18,13 @@

"tls_config": {
"key_file": "configs/server2.key",
"cert_file": "configs/server2.pem"
"cert_file": "configs/server2.pem",
},

"node_config": {
"listen_addr": "127.0.1.3:6668",
"cert_file": "configs/server2.pem",
"key_file": "configs/server2.key"
"key_file": "configs/server2.key",
},

"log": {
Expand All @@ -37,28 +37,27 @@
"module-levels": {
"rustls": "error",
"tracing": "warn",
"": "debug"
"": "debug",
},

"targets": [
{
"target": "stdout",
"level": "debug"
"level": "debug",
},
{
"target": { "filename": "sable.log" },
"level": "info"
}
"level": "info",
},
/*
,
{
"target": { "filename": "trace.log" },
"level": "trace",
"modules": [ "irc" ]
}
"modules": [ "irc" ],
},
*/
]
],

// , "console-address": "127.0.1.3:9999"
}
}
// "console-address": "127.0.1.3:9999"
},
}
26 changes: 13 additions & 13 deletions configs/services.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"address": "127.0.1.4:8888",
"client_ca": "configs/ca_cert.pem",
"authorised_fingerprints": [
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" }
]
{ "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
],
},

"server": {
Expand Down Expand Up @@ -61,19 +61,19 @@
"quiet_view", "quiet_add", "quiet_remove_any",
"exempt_view", "exempt_add", "exempt_remove_any",
"invex_view", "invex_add", "invex_remove_any"
]
}
],
},
},

"tls_config": {
"key_file": "configs/services.key",
"cert_file": "configs/services.pem"
"cert_file": "configs/services.pem",
},

"node_config": {
"listen_addr": "127.0.1.4:6668",
"cert_file": "configs/services.pem",
"key_file": "configs/services.key"
"key_file": "configs/services.key",
},

"log": {
Expand All @@ -92,27 +92,27 @@

"sable": "debug",

"": "info"
"": "info",
},

"targets": [
{
"target": "stdout",
"level": "trace",
"modules": [ "sable_services" ]
"modules": [ "sable_services" ],
},
{
"target": { "filename": "sable.log" },
"level": "info"
"level": "info",
}
,
{
"target": { "filename": "trace.log" },
"level": "trace"
}
"level": "trace",
},

]
],

, "console-address": "127.0.1.4:9999"
"console-address": "127.0.1.4:9999",
}
}

0 comments on commit c2c9321

Please sign in to comment.