resolve conflicts
This commit is contained in:
Jonas Marklén
parent
efd2b31104
commit
8f77a89fce
|
|
@ -2,7 +2,7 @@ openapi: 3.0.3
|
||||||
info:
|
info:
|
||||||
title: AdGuard Home
|
title: AdGuard Home
|
||||||
description: AdGuard Home REST API. Admin web interface is built on top of this REST API.
|
description: AdGuard Home REST API. Admin web interface is built on top of this REST API.
|
||||||
version: "0.101"
|
version: "0.102"
|
||||||
contact:
|
contact:
|
||||||
name: "AdGuard Home"
|
name: "AdGuard Home"
|
||||||
url: "https://github.com/AdguardTeam/AdGuardHome"
|
url: "https://github.com/AdguardTeam/AdGuardHome"
|
||||||
|
|
@ -77,22 +77,6 @@ paths:
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: OK
|
description: OK
|
||||||
/set_upstreams_config:
|
|
||||||
post:
|
|
||||||
tags:
|
|
||||||
- global
|
|
||||||
operationId: setUpstreamsConfig
|
|
||||||
summary: Updates the current upstreams configuration
|
|
||||||
requestBody:
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/UpstreamsConfig"
|
|
||||||
description: Upstreams configuration JSON
|
|
||||||
required: true
|
|
||||||
responses:
|
|
||||||
"200":
|
|
||||||
description: OK
|
|
||||||
/test_upstream_dns:
|
/test_upstream_dns:
|
||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
|
|
@ -531,7 +515,7 @@ paths:
|
||||||
parameters:
|
parameters:
|
||||||
- name: name
|
- name: name
|
||||||
in: query
|
in: query
|
||||||
description: Host name
|
description: Filter by host name
|
||||||
schema:
|
schema:
|
||||||
type: string
|
type: string
|
||||||
responses:
|
responses:
|
||||||
|
|
@ -725,8 +709,8 @@ paths:
|
||||||
summary: Get information about selected clients by their IP address
|
summary: Get information about selected clients by their IP address
|
||||||
parameters:
|
parameters:
|
||||||
- name: ip0
|
- name: ip0
|
||||||
description: IP
|
|
||||||
in: query
|
in: query
|
||||||
|
description: Filter by IP address
|
||||||
schema:
|
schema:
|
||||||
type: string
|
type: string
|
||||||
responses:
|
responses:
|
||||||
|
|
@ -975,16 +959,6 @@ components:
|
||||||
type: boolean
|
type: boolean
|
||||||
running:
|
running:
|
||||||
type: boolean
|
type: boolean
|
||||||
bootstrap_dns:
|
|
||||||
type: string
|
|
||||||
example: 8.8.8.8:53
|
|
||||||
upstream_dns:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
example:
|
|
||||||
- tls://1.1.1.1
|
|
||||||
- tls://1.0.0.1
|
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
example: "0.1"
|
example: "0.1"
|
||||||
|
|
@ -994,33 +968,6 @@ components:
|
||||||
DNSConfig:
|
DNSConfig:
|
||||||
type: object
|
type: object
|
||||||
description: Query log configuration
|
description: Query log configuration
|
||||||
properties:
|
|
||||||
protection_enabled:
|
|
||||||
type: boolean
|
|
||||||
ratelimit:
|
|
||||||
type: integer
|
|
||||||
blocking_mode:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- default
|
|
||||||
- nxdomain
|
|
||||||
- null_ip
|
|
||||||
- custom_ip
|
|
||||||
blocking_ipv4:
|
|
||||||
type: string
|
|
||||||
blocking_ipv6:
|
|
||||||
type: string
|
|
||||||
edns_cs_enabled:
|
|
||||||
type: boolean
|
|
||||||
dnssec_enabled:
|
|
||||||
type: boolean
|
|
||||||
UpstreamsConfig:
|
|
||||||
type: object
|
|
||||||
description: Upstreams configuration
|
|
||||||
required:
|
|
||||||
- bootstrap_dns
|
|
||||||
- upstream_dns
|
|
||||||
- all_servers
|
|
||||||
properties:
|
properties:
|
||||||
bootstrap_dns:
|
bootstrap_dns:
|
||||||
type: array
|
type: array
|
||||||
|
|
@ -1040,10 +987,56 @@ components:
|
||||||
example:
|
example:
|
||||||
- tls://1.1.1.1
|
- tls://1.1.1.1
|
||||||
- tls://1.0.0.1
|
- tls://1.0.0.1
|
||||||
all_servers:
|
protection_enabled:
|
||||||
|
type: boolean
|
||||||
|
ratelimit:
|
||||||
|
type: integer
|
||||||
|
blocking_mode:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- default
|
||||||
|
- nxdomain
|
||||||
|
- null_ip
|
||||||
|
- custom_ip
|
||||||
|
blocking_ipv4:
|
||||||
|
type: string
|
||||||
|
blocking_ipv6:
|
||||||
|
type: string
|
||||||
|
edns_cs_enabled:
|
||||||
|
type: boolean
|
||||||
|
dnssec_enabled:
|
||||||
|
type: boolean
|
||||||
|
fastest_addr:
|
||||||
|
type: boolean
|
||||||
|
parallel_requests:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: If true, parallel queries to all configured upstream servers are
|
description: If true, parallel queries to all configured upstream servers are
|
||||||
enabled
|
enabled
|
||||||
|
UpstreamsConfig:
|
||||||
|
type: object
|
||||||
|
description: Upstreams configuration
|
||||||
|
required:
|
||||||
|
- bootstrap_dns
|
||||||
|
- upstream_dns
|
||||||
|
properties:
|
||||||
|
bootstrap_dns:
|
||||||
|
type: array
|
||||||
|
description: Bootstrap servers, port is optional after colon. Empty value will
|
||||||
|
reset it to default values
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
example:
|
||||||
|
- 8.8.8.8:53
|
||||||
|
- 1.1.1.1:53
|
||||||
|
upstream_dns:
|
||||||
|
type: array
|
||||||
|
description: Upstream servers, port is optional after colon. Empty value will
|
||||||
|
reset it to default values
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
example:
|
||||||
|
- tls://1.1.1.1
|
||||||
|
- tls://1.0.0.1
|
||||||
Filter:
|
Filter:
|
||||||
type: object
|
type: object
|
||||||
description: Filter subscription info
|
description: Filter subscription info
|
||||||
|
|
@ -1824,4 +1817,4 @@ components:
|
||||||
description: User name
|
description: User name
|
||||||
password:
|
password:
|
||||||
type: string
|
type: string
|
||||||
description: Password
|
description: Password
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "^4.16.4",
|
"express": "^4.16.4",
|
||||||
"swagger-ui-dist": "^3.20.1",
|
"speccy": "^0.11.0",
|
||||||
"speccy": "^0.11.0"
|
"swagger-ui-dist": "^3.25.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue