Browse Source

bug issue #47

master
vx3r 3 months ago
parent
commit
8b4038c238
2 changed files with 8 additions and 22 deletions
  1. +3
    -22
      api/v1/server/server.go
  2. +5
    -0
      core/server.go

+ 3
- 22
api/v1/server/server.go View File

@@ -6,7 +6,6 @@ import (
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/auth"
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/core"
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/model"
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/template"
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/version"
"golang.org/x/oauth2"
"net/http"
@@ -74,30 +73,12 @@ func updateServer(c *gin.Context) {
}

func configServer(c *gin.Context) {
clients, err := core.ReadClients()
configData, err := core.ReadWgConfigFile()
if err != nil {
log.WithFields(log.Fields{
"err": err,
}).Error("failed to read clients")
c.AbortWithStatus(http.StatusUnprocessableEntity)
return
}

server, err := core.ReadServer()
if err != nil {
log.WithFields(log.Fields{
"err": err,
}).Error("failed to read server")
c.AbortWithStatus(http.StatusUnprocessableEntity)
return
}

configData, err := template.DumpServerWg(clients, server)
if err != nil {
log.WithFields(log.Fields{
"err": err,
}).Error("failed to dump wg config")
c.AbortWithStatus(http.StatusUnprocessableEntity)
}).Error("failed to read wg config file")
c.AbortWithStatus(http.StatusInternalServerError)
return
}



+ 5
- 0
core/server.go View File

@@ -168,3 +168,8 @@ func GetAllReservedIps() ([]string, error) {

return reserverIps, nil
}

// ReadWgConfigFile return content of wireguard config file
func ReadWgConfigFile() ([]byte, error) {
return util.ReadFile(filepath.Join(os.Getenv("WG_CONF_DIR"), os.Getenv("WG_INTERFACE_NAME")))
}

Loading…
Cancel
Save