mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2Author: 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: c0d880bed5bd452516Author: 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
59 lines
1.2 KiB
Go
59 lines
1.2 KiB
Go
package confmigrate
|
|
|
|
import (
|
|
"fmt"
|
|
"net/netip"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
)
|
|
|
|
// migrateTo23 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 22
|
|
// 'bind_host': '1.2.3.4'
|
|
// 'bind_port': 8080
|
|
// 'web_session_ttl': 720
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 23
|
|
// 'http':
|
|
// 'address': '1.2.3.4:8080'
|
|
// 'session_ttl': '720h'
|
|
// # …
|
|
func migrateTo23(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 23
|
|
|
|
bindHost, ok, err := fieldVal[string](diskConf, "bind_host")
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
bindHostAddr, err := netip.ParseAddr(bindHost)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid bind_host value: %s", bindHost)
|
|
}
|
|
|
|
bindPort, _, err := fieldVal[int](diskConf, "bind_port")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sessionTTL, _, err := fieldVal[int](diskConf, "web_session_ttl")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
diskConf["http"] = yobj{
|
|
"address": netip.AddrPortFrom(bindHostAddr, uint16(bindPort)).String(),
|
|
"session_ttl": timeutil.Duration{Duration: time.Duration(sessionTTL) * time.Hour}.String(),
|
|
}
|
|
|
|
delete(diskConf, "bind_host")
|
|
delete(diskConf, "bind_port")
|
|
delete(diskConf, "web_session_ttl")
|
|
|
|
return nil
|
|
}
|