Skip to content

Commit

Permalink
Merge branch 'master' into ADG-7988
Browse files Browse the repository at this point in the history
  • Loading branch information
IldarKamalov committed Jan 16, 2024
2 parents 2de46aa + f7995aa commit dfd1eff
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,14 @@ NOTE: Add new changes BELOW THIS COMMENT.

#### Configuration changes

In this release, the schema version has changed from 27 to 28.

- The new property `clients.persistent.*.uid`, which is unique identifier of the
persistent client.
- The properties `dns.'all_servers` and `dns.fastest_addr` were removed, their
- The properties `dns.all_servers` and `dns.fastest_addr` were removed, their
values migrated to newly added field `dns.upstream_mode` that describes the
logic through which upstreams will be used.
logic through which upstreams will be used. See also a [Wiki
page][wiki-config].

```yaml
# BEFORE:
Expand All @@ -60,6 +63,10 @@ NOTE: Add new changes BELOW THIS COMMENT.
'upstream_mode': 'parallel'
```
To rollback this change, remove the new field `upstream_mode`, set back
`dns.all_servers` and `dns.fastest_addr` properties in `dns` section, and
change the `schema_version` back to `27`.

### Fixed

- Schedule display in the client settings after creating or updating.
Expand All @@ -86,6 +93,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6574]: https://github.com/AdguardTeam/AdGuardHome/issues/6574
[#6584]: https://github.com/AdguardTeam/AdGuardHome/issues/6584

[wiki-config]: https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
-->
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,15 @@ Open your terminal and execute these commands:
git clone https://github.com/AdguardTeam/AdGuardHome
cd AdGuardHome
make
```

#### <a href="#building-node" id="building-node" name="building-node">Building with Node.js 17 and later</a>

In order to build AdGuard Home with Node.js 17 and later, specify
`--openssl-legacy-provider` option.

```sh
export NODE_OPTIONS=--openssl-legacy-provider
```

**NOTE:** The non-standard `-j` flag is currently not supported, so building
Expand Down
2 changes: 1 addition & 1 deletion client/src/helpers/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export const SCHEME_TO_PROTOCOL_MAP = {
export const DNS_REQUEST_OPTIONS = {
PARALLEL: 'parallel',
FASTEST_ADDR: 'fastest_addr',
LOAD_BALANCING: '',
LOAD_BALANCING: 'load_balance',
};

export const DHCP_FORM_NAMES = {
Expand Down
4 changes: 3 additions & 1 deletion client/src/reducers/dnsConfig.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { handleActions } from 'redux-actions';

import * as actions from '../actions/dnsConfig';
import { ALL_INTERFACES_IP, BLOCKING_MODES } from '../helpers/constants';
import { ALL_INTERFACES_IP, BLOCKING_MODES, DNS_REQUEST_OPTIONS } from '../helpers/constants';

const DEFAULT_BLOCKING_IPV4 = ALL_INTERFACES_IP;
const DEFAULT_BLOCKING_IPV6 = '::';
Expand All @@ -15,6 +15,7 @@ const dnsConfig = handleActions(
blocking_ipv4,
blocking_ipv6,
upstream_dns,
upstream_mode,
fallback_dns,
bootstrap_dns,
local_ptr_upstreams,
Expand All @@ -33,6 +34,7 @@ const dnsConfig = handleActions(
local_ptr_upstreams: (local_ptr_upstreams && local_ptr_upstreams.join('\n')) || '',
ratelimit_whitelist: (ratelimit_whitelist && ratelimit_whitelist.join('\n')) || '',
processingGetConfig: false,
upstream_mode: upstream_mode === '' ? DNS_REQUEST_OPTIONS.LOAD_BALANCING : upstream_mode,
};
},

Expand Down

0 comments on commit dfd1eff

Please sign in to comment.