mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-01-09 23:47:23 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Sep 6 12:48:05 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit 232f18481bbf3400da0b95bcec7949fb3868bf85 Merge: c0d880bed5bd452516
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 18:54:47 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit c0d880bed6e3270e88f5377e66b787565e1249ce Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 17:21:57 2023 +0300 confmigrate: fix v15 commit 8a27148b708e6d6a61f8097bf7792aefa1055772 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 15:47:18 2023 +0300 confmigrate: imp gocognit, overall
45 lines
860 B
Go
45 lines
860 B
Go
package confmigrate
|
|
|
|
// migrateTo18 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 17
|
|
// 'dns':
|
|
// 'safesearch_enabled': true
|
|
// # …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 18
|
|
// 'dns':
|
|
// 'safe_search':
|
|
// 'enabled': true
|
|
// 'bing': true
|
|
// 'duckduckgo': true
|
|
// 'google': true
|
|
// 'pixabay': true
|
|
// 'yandex': true
|
|
// 'youtube': true
|
|
// # …
|
|
// # …
|
|
func migrateTo18(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 18
|
|
|
|
dns, ok, err := fieldVal[yobj](diskConf, "dns")
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
safeSearch := yobj{
|
|
"enabled": true,
|
|
"bing": true,
|
|
"duckduckgo": true,
|
|
"google": true,
|
|
"pixabay": true,
|
|
"yandex": true,
|
|
"youtube": true,
|
|
}
|
|
dns["safe_search"] = safeSearch
|
|
|
|
return moveVal[bool](dns, safeSearch, "safesearch_enabled", "enabled")
|
|
}
|