Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openvpn-app
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cloudron
openvpn-app
Commits
6fa71ae5
Commit
6fa71ae5
authored
Sep 25, 2020
by
Johannes Zellner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix server line detection
parent
bb14d4d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
server.js
server.js
+4
-4
No files found.
server.js
View file @
6fa71ae5
...
...
@@ -63,14 +63,14 @@ function getOpenVPNSetting() {
tmp
=
tmp
.
filter
((
l
)
=>
{
return
l
&&
l
[
0
]
!==
'
#
'
;
});
function
findItem
(
prefix
)
{
let
idx
=
tmp
.
findIndex
((
l
)
=>
{
return
l
.
indexOf
(
prefix
)
===
0
;
});
let
idx
=
tmp
.
findIndex
((
l
)
=>
{
return
l
.
indexOf
(
prefix
)
!==
-
1
;
});
if
(
idx
===
-
1
)
return
null
;
return
tmp
[
idx
].
slice
(
prefix
.
length
).
trim
().
replace
(
/
[
"
]
+$/g
,
''
);
}
settings
.
address
=
findItem
(
'
server
'
).
split
(
'
'
)[
0
];
settings
.
netmask
=
findItem
(
'
server
'
).
split
(
'
'
)[
1
];
settings
.
address
=
findItem
(
'
server
'
).
split
(
'
'
)[
0
];
settings
.
netmask
=
findItem
(
'
server
'
).
split
(
'
'
)[
1
];
settings
.
dnsServer
=
findItem
(
'
push "dhcp-option DNS
'
);
settings
.
allowICC
=
findItem
(
'
client-to-client
'
)
!==
null
;
...
...
@@ -97,7 +97,7 @@ function setOpenVPNSetting(settings) {
else
tmp
[
idx
]
=
value
;
// server
idx
=
tmp
.
findIndex
((
l
)
=>
{
return
l
.
indexOf
(
'
server
'
)
!==
-
1
;
});
idx
=
tmp
.
findIndex
((
l
)
=>
{
return
l
.
indexOf
(
'
server
'
)
===
0
||
l
.
indexOf
(
'
# server
'
)
===
0
;
});
value
=
`server
${
settings
.
address
}
${
settings
.
netmask
}
`
;
if
(
idx
===
-
1
)
tmp
.
push
(
value
);
else
tmp
[
idx
]
=
value
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment