Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
d2a9bf5c
Commit
d2a9bf5c
authored
Dec 05, 2020
by
Thomas Gambier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/turnserver: fix tests
parent
bceebc59
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
10 deletions
+4
-10
software/turnserver/buildout.hash.cfg
software/turnserver/buildout.hash.cfg
+1
-1
software/turnserver/instance-insecure-turnserver.cfg.jinja2.in
...are/turnserver/instance-insecure-turnserver.cfg.jinja2.in
+0
-8
software/turnserver/test/test.py
software/turnserver/test/test.py
+3
-1
No files found.
software/turnserver/buildout.hash.cfg
View file @
d2a9bf5c
...
...
@@ -23,4 +23,4 @@ md5sum = df8768f165036dbe0435bd1678b9deb3
[template-insecure-turnserver]
filename = instance-insecure-turnserver.cfg.jinja2.in
md5sum =
0e0807eef75a1ee6f9aef3a6a566a729
md5sum =
e88678b9f322251a201860a13f4db6b8
software/turnserver/instance-insecure-turnserver.cfg.jinja2.in
View file @
d2a9bf5c
...
...
@@ -59,13 +59,6 @@ name = turnserver-port-listening.py
config-hostname = {{ listining_ip }}
config-port = {{ turn_port }}
[promise-check-turnserver-tls-port]
<= monitor-promise-base
module = check_port_listening
name = turnserver-tls-port-listening.py
config-hostname = {{ listining_ip }}
config-port = {{ turn_tls_port }}
[publish-connection-information]
<= monitor-publish
recipe = slapos.cookbook:publish
...
...
@@ -83,7 +76,6 @@ parts =
{{ part_list | join('\n ') }}
# turn server
turnserver-wrapper
promise-check-turnserver-tls-port
promise-check-turnserver-port
eggs-directory = {{ eggs_directory }}
...
...
software/turnserver/test/test.py
View file @
d2a9bf5c
...
...
@@ -118,6 +118,7 @@ mobility
no-tlsv1
no-tlsv1_1
no-stdout-log
simple-log
log-file=%(instance_path)s/var/log/turnserver.log
userdb=%(instance_path)s/srv/turndb
pidfile=%(instance_path)s/var/run/turnserver.pid
...
...
@@ -173,6 +174,7 @@ mobility
no-tlsv1
no-tlsv1_1
no-stdout-log
simple-log
log-file=%(instance_path)s/var/log/turnserver.log
userdb=%(instance_path)s/srv/turndb
pidfile=%(instance_path)s/var/run/turnserver.pid
...
...
@@ -239,7 +241,7 @@ simple-log
log-file=%(instance_path)s/var/log/turnserver.log
pidfile=%(instance_path)s/var/run/turnserver.pid
verbose
user=nxdturn:%(password)"""
%
{
'instance_path'
:
self
.
partition_path
,
'password'
:
password
,
'ipv4'
:
self
.
_ipv4_address
}
user=nxdturn:%(password)
s
"""
%
{
'instance_path'
:
self
.
partition_path
,
'password'
:
password
,
'ipv4'
:
self
.
_ipv4_address
}
with
open
(
os
.
path
.
join
(
self
.
partition_path
,
'etc/turnserver.conf'
))
as
f
:
current_config
=
f
.
read
().
strip
()
...
...
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