daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: 2829 rm util

Browse Source 
Merge in DNS/adguard-home from 2829-finally to master

Closes #2829.

Squashed commit of the following:

commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 18:39:54 2021 +0300

    util: rm
This commit is contained in:
Eugene Burkov
2021-04-21 18:50:33 +03:00
parent c9a5a5b9c8
commit 2d87a0458e
3 changed files with 98 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/home/home.go
View File

@@ -30,7 +30,6 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/AdGuardHome/internal/updater"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/version"
"github.com/AdguardTeam/golibs/log"
"gopkg.in/natefinch/lumberjack.v2"
@@ -139,8 +138,8 @@ func setupContext(args options) {
initConfig()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
Context.tlsRoots = LoadSystemRootCAs()
Context.tlsCiphers = InitTLSCiphers()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,