Skip to content

Commit

Permalink
Wire up wireguard file code
Browse files Browse the repository at this point in the history
  • Loading branch information
qdm12 committed Aug 27, 2022
1 parent 57901ec commit 48a6b5b
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
16 changes: 16 additions & 0 deletions internal/configuration/sources/files/provider.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package files

import (
"fmt"

"github.com/qdm12/gluetun/internal/configuration/settings"
)

func (s *Source) readProvider() (provider settings.Provider, err error) {
provider.ServerSelection, err = s.readServerSelection()
if err != nil {
return provider, fmt.Errorf("server selection: %w", err)
}

return provider, nil
}
16 changes: 16 additions & 0 deletions internal/configuration/sources/files/serverselection.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package files

import (
"fmt"

"github.com/qdm12/gluetun/internal/configuration/settings"
)

func (s *Source) readServerSelection() (selection settings.ServerSelection, err error) {
selection.Wireguard, err = s.readWireguardSelection()
if err != nil {
return selection, fmt.Errorf("wireguard: %w", err)
}

return selection, nil
}
10 changes: 10 additions & 0 deletions internal/configuration/sources/files/vpn.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,20 @@ import (
)

func (s *Source) readVPN() (vpn settings.VPN, err error) {
vpn.Provider, err = s.readProvider()
if err != nil {
return vpn, fmt.Errorf("provider: %w", err)
}

vpn.OpenVPN, err = s.readOpenVPN()
if err != nil {
return vpn, fmt.Errorf("OpenVPN: %w", err)
}

vpn.Wireguard, err = s.readWireguard()
if err != nil {
return vpn, fmt.Errorf("wireguard: %w", err)
}

return vpn, nil
}

0 comments on commit 48a6b5b

Please sign in to comment.