Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qa-deploy-utils
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
qa-deploy-utils
Commits
24c63bdf
Commit
24c63bdf
authored
Nov 16, 2017
by
tywldx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
20ec463f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
get_project_config.js
qa_shell_script/config_server/get_project_config.js
+1
-1
make_frp_ini.sh
qa_shell_script/ngrok/make_frp_ini.sh
+4
-4
No files found.
qa_shell_script/config_server/get_project_config.js
View file @
24c63bdf
...
...
@@ -214,7 +214,7 @@ configFunction.prototype = {
for
(
var
j
=
0
;
j
<
attrs
.
length
;
j
++
)
{
li
.
push
(
projects
[
i
][
attrs
[
j
]]);
}
li
.
push
(
projects
[
i
].
url
);
//
li.push(projects[i].url);
list
.
push
(
li
.
join
(
"
|
"
));
}
}
...
...
qa_shell_script/ngrok/make_frp_ini.sh
View file @
24c63bdf
...
...
@@ -145,8 +145,8 @@ createNginxSSLConf store 172.30.199.2 9000 $nginxname/store.conf
for
ip_last
in
${
ips
[@]
}
do
projectAndPort
=
`
node
$config_server
/get_project_config.js
-type
multi
-attr
port
-attr2
true
`
for
projectAndPort
in
${
projectAndPort
[@]
}
projectAndPort
s
=
`
node
$config_server
/get_project_config.js
-type
multi
-attr
port
-attr2
true
`
for
projectAndPort
in
${
projectAndPort
s
[@]
}
do
var
=(
${
projectAndPort
//|/
}
)
addFrpcSub
${
var
[0]
}
http 192.168.4
$ip_last
${
var
[1]
}
${
var
[0]
}
-
${
ip_last
}
$filename
...
...
@@ -156,8 +156,8 @@ done
for
host_name
in
{
0..1
}
do
projectAndPort
=
`
node
$config_server
/get_project_config.js
-type
multi
-attr
port
-attr2
true
`
for
projectAndPort
in
${
projectAndPort
[@]
}
projectAndPort
s
=
`
node
$config_server
/get_project_config.js
-type
multi
-attr
port/url
-attr2
true
`
for
projectAndPort
in
${
projectAndPort
s
[@]
}
do
var
=(
${
projectAndPort
//|/
}
)
addFrpcSub
${
var
[0]
}
-
${
var
[2]
}
http 127.0.0 1 8000
${
var
[2]
}
-qa
${
host_name
}
$filename
...
...
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