xsteadfastx/wg-quicker
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Feature: variable config dir
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Cornelio Hopmann 2022-01-06 12:44:26 +01:00 committed by xsteadfastx
parent d459840463
commit db73a57c8d
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/root.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"strings"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -18,6 +19,7 @@ var (
) )
var ( var (
cfgDir string
iface string iface string
verbose bool verbose bool
protocol int protocol int
@ -112,7 +114,7 @@ func loadConfig(cfg string) (*wgquick.Config, logrus.FieldLogger) {
log = logrus.WithField("iface", iface) log = logrus.WithField("iface", iface)
} }
cfg = "/etc/wireguard/" + cfg + ".conf" cfg = fmt.Sprintf("%s/%s.conf", cfgDir, cfg)
_, err = os.Stat(cfg) _, err = os.Stat(cfg)
if err != nil { if err != nil {
@ -140,6 +142,9 @@ func loadConfig(cfg string) (*wgquick.Config, logrus.FieldLogger) {
} }
func init() { func init() {
cobra.OnInitialize(initConfig)
rootCmd.PersistentFlags().StringVar(&cfgDir, "config-dir", "", "config directory (default is /etc/wireguard)")
rootCmd.PersistentFlags().StringVarP(&iface, "iface", "i", "", "if interface name should differ from config") rootCmd.PersistentFlags().StringVarP(&iface, "iface", "i", "", "if interface name should differ from config")
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose") rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose")
rootCmd.PersistentFlags().IntVarP(&protocol, "route-protocol", "p", 0, "route protocol to use for our routes") rootCmd.PersistentFlags().IntVarP(&protocol, "route-protocol", "p", 0, "route protocol to use for our routes")
@ -157,6 +162,14 @@ func init() {
rootCmd.AddCommand(showCmd) rootCmd.AddCommand(showCmd)
} }
func initConfig() {
if cfgDir != "" {
cfgDir = "/etc/wireguard"
}
cfgDir = strings.TrimSuffix(cfgDir, "/")
}
func Execute() { func Execute() {
if err := rootCmd.Execute(); err != nil { if err := rootCmd.Execute(); err != nil {
logrus.Fatal(err) logrus.Fatal(err)