Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Turris
ucollect
Commits
0eacd9cb
Commit
0eacd9cb
authored
Nov 19, 2013
by
Michal 'vorner' Vaner
Browse files
Don't specify path for socat
So we can place a socat sooner in the path, with better capabilities.
parent
6911073f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/master/collect-master.py
View file @
0eacd9cb
...
...
@@ -77,9 +77,9 @@ class Socat(protocol.ProcessProtocol):
def
errReceived
(
self
,
data
):
logging
.
warn
(
'Socat complained: %s'
,
data
)
args
=
[
'
/usr/bin/
socat'
,
'OPENSSL-LISTEN:'
+
str
(
master_config
.
getint
(
'port'
))
+
',fork,backlog=50,key='
+
master_config
.
get
(
'key'
)
+
',cert='
+
master_config
.
get
(
'cert'
)
+
',verify=0,cipher=HIGH:!MEDIUM:!LOW:!aNULL,reuseaddr,pf=ip6'
,
'UNIX-CONNECT:./collect-master.sock'
]
args
=
[
'socat'
,
'OPENSSL-LISTEN:'
+
str
(
master_config
.
getint
(
'port'
))
+
',fork,backlog=50,key='
+
master_config
.
get
(
'key'
)
+
',cert='
+
master_config
.
get
(
'cert'
)
+
',verify=0,cipher=HIGH:!MEDIUM:!LOW:!aNULL,reuseaddr,pf=ip6'
,
'UNIX-CONNECT:./collect-master.sock'
]
logging
.
debug
(
'Starting socat with: %s'
,
args
)
reactor
.
spawnProcess
(
Socat
(),
'
/usr/bin/
socat'
,
args
=
args
,
env
=
os
.
environ
)
reactor
.
spawnProcess
(
Socat
(),
'socat'
,
args
=
args
,
env
=
os
.
environ
)
endpoint
.
listen
(
ClientFactory
(
plugins
))
logging
.
info
(
'Init done'
)
...
...
Write
Preview
Supports
Markdown
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