Private GIT
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
wg-gen-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vlbox
wg-gen-web
Commits
8b4038c2
Commit
8b4038c2
authored
4 years ago
by
vx3r
Browse files
Options
Downloads
Patches
Plain Diff
bug issue #47
parent
4a6cc6de
Loading
Loading
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/v1/server/server.go
+3
-22
3 additions, 22 deletions
api/v1/server/server.go
core/server.go
+5
-0
5 additions, 0 deletions
core/server.go
with
8 additions
and
22 deletions
api/v1/server/server.go
+
3
−
22
View file @
8b4038c2
...
...
@@ -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
)
{
c
lients
,
err
:=
core
.
Read
Clients
()
c
onfigData
,
err
:=
core
.
Read
WgConfigFile
()
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
}
...
...
This diff is collapsed.
Click to expand it.
core/server.go
+
5
−
0
View file @
8b4038c2
...
...
@@ -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"
)))
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment