mirror of https://github.com/ospab/ostp.git
Update --init templates to v0.3.1 format
- Add api field to server config template - Add api and multiplex fields to client config template - Include localhost and 127.0.0.1 in default routing rules - Match --init output with wizard-generated configs
This commit is contained in:
parent
9fb2042cad
commit
9e2ab59121
|
|
@ -1420,17 +1420,40 @@ async fn run_app() -> Result<()> {
|
||||||
"log": {{
|
"log": {{
|
||||||
"level": "info"
|
"level": "info"
|
||||||
}},
|
}},
|
||||||
|
|
||||||
// The address and port the server listens on for incoming OSTP connections.
|
// The address and port the server listens on for incoming OSTP connections.
|
||||||
"listen": "0.0.0.0:50000",
|
"listen": "0.0.0.0:50000",
|
||||||
|
|
||||||
// List of valid keys. Clients must use one of these to connect.
|
// List of valid keys. Clients must use one of these to connect.
|
||||||
"access_keys": [
|
"access_keys": [
|
||||||
"{}"
|
"{}"
|
||||||
],
|
],
|
||||||
|
|
||||||
// Optional proxy for outbound traffic.
|
// Optional proxy for outbound traffic.
|
||||||
" // Fallback TCP proxy: unrecognized connections are proxied to a web server (anti-DPI).
|
"outbound": {{
|
||||||
|
"enabled": false,
|
||||||
|
"protocol": "socks5",
|
||||||
|
"address": "127.0.0.1",
|
||||||
|
"port": 9050,
|
||||||
|
"default_action": "proxy",
|
||||||
|
"rules": [
|
||||||
|
{{
|
||||||
|
"domain_suffix": [".onion"],
|
||||||
|
"action": "proxy"
|
||||||
|
}}
|
||||||
|
]
|
||||||
|
}},
|
||||||
|
|
||||||
|
// Management API configuration.
|
||||||
|
"api": {{
|
||||||
|
"enabled": false,
|
||||||
|
"bind": "0.0.0.0:9090",
|
||||||
|
"webpath": "",
|
||||||
|
"username": "",
|
||||||
|
"password_hash": ""
|
||||||
|
}},
|
||||||
|
|
||||||
|
// Fallback TCP proxy: unrecognized connections are proxied to a web server (anti-DPI).
|
||||||
"fallback": {{
|
"fallback": {{
|
||||||
"enabled": false,
|
"enabled": false,
|
||||||
"listen": "0.0.0.0:443",
|
"listen": "0.0.0.0:443",
|
||||||
|
|
@ -1463,6 +1486,11 @@ async fn run_app() -> Result<()> {
|
||||||
// DO NOT EDIT THIS COMMENT - Migrator relies on it
|
// DO NOT EDIT THIS COMMENT - Migrator relies on it
|
||||||
"version": "0.3.1",
|
"version": "0.3.1",
|
||||||
"mode": "client",
|
"mode": "client",
|
||||||
|
"api": {{
|
||||||
|
"enabled": true,
|
||||||
|
"bind": "127.0.0.1:50001",
|
||||||
|
"token": "{key}"
|
||||||
|
}},
|
||||||
"log": {{
|
"log": {{
|
||||||
"level": "info"
|
"level": "info"
|
||||||
}},
|
}},
|
||||||
|
|
@ -1487,9 +1515,13 @@ async fn run_app() -> Result<()> {
|
||||||
"tag": "proxy",
|
"tag": "proxy",
|
||||||
"server": "YOUR_SERVER_IP",
|
"server": "YOUR_SERVER_IP",
|
||||||
"port": 50000,
|
"port": 50000,
|
||||||
"access_key": "{key}",
|
"access_key": "YOUR_ACCESS_KEY",
|
||||||
"transport": {{
|
"transport": {{
|
||||||
"type": "udp"
|
"type": "udp"
|
||||||
|
}},
|
||||||
|
"multiplex": {{
|
||||||
|
"enabled": false,
|
||||||
|
"sessions": 1
|
||||||
}}
|
}}
|
||||||
}},
|
}},
|
||||||
{{
|
{{
|
||||||
|
|
@ -1504,7 +1536,7 @@ async fn run_app() -> Result<()> {
|
||||||
"routing": {{
|
"routing": {{
|
||||||
"rules": [
|
"rules": [
|
||||||
{{
|
{{
|
||||||
"domain_suffix": ["localhost"],
|
"domain_suffix": ["localhost", "127.0.0.1"],
|
||||||
"outbound": "direct"
|
"outbound": "direct"
|
||||||
}}
|
}}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue