From b48439c25b690d25db23caa61990d76c63d6bc66 Mon Sep 17 00:00:00 2001 From: kevin Date: Wed, 27 Dec 2023 17:53:41 +0800 Subject: [PATCH] fix wg.conf template. --- templates/wg.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/wg.conf b/templates/wg.conf index 3b80e0d..2112a0c 100644 --- a/templates/wg.conf +++ b/templates/wg.conf @@ -7,11 +7,11 @@ Address = {{$first :=true}}{{range .serverConfig.Interface.Addresses }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}} ListenPort = {{ .serverConfig.Interface.ListenPort }} PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }} -{{if .globalSettings.MTU }}MTU = {{ .globalSettings.MTU }} -{{end}}{{if .serverConfig.Interface.PostUp }}PostUp = {{ .serverConfig.Interface.PostUp }} -{{end}}{{if .serverConfig.Interface.PreDown }}PreDown = {{ .serverConfig.Interface.PreDown }} -{{end}}{{if .serverConfig.Interface.PostDown }}PostDown = {{ .serverConfig.Interface.PostDown }} -{{end}}{{if .globalSettings.Table }}Table = {{ .globalSettings.Table }}{{end}} +{{if .globalSettings.MTU}}MTU = {{ .globalSettings.MTU }}{{end}} +PostUp = {{ .serverConfig.Interface.PostUp }} +PreDown = {{ .serverConfig.Interface.PreDown }} +PostDown = {{ .serverConfig.Interface.PostDown }} +Table = {{ .globalSettings.Table }} {{range .clientDataList}}{{if eq .Client.Enabled true}} # ID: {{ .Client.ID }} @@ -21,7 +21,7 @@ PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }} # Update at: {{ .Client.UpdatedAt }} [Peer] PublicKey = {{ .Client.PublicKey }} -{{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }} -{{end}}AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}} +{{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}{{end}} +AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}} {{if .Client.Endpoint }}Endpoint = {{ .Client.Endpoint }}{{end}} {{end}}{{end}}