~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mdw/multi-priv'
[tripe]
/
svc
/
connect.in
diff --git
a/svc/connect.in
b/svc/connect.in
index
dae1162
..
5f8940e
100644
(file)
--- a/
svc/connect.in
+++ b/
svc/connect.in
@@
-87,10
+87,14
@@
def addpeer(peer, addr):
if peer.name in S.list():
S.kill(peer.name)
try:
if peer.name in S.list():
S.kill(peer.name)
try:
+ booltrue = ['t', 'true', 'y', 'yes', 'on']
S.add(peer.name,
tunnel = peer.get('tunnel', None),
keepalive = peer.get('keepalive', None),
S.add(peer.name,
tunnel = peer.get('tunnel', None),
keepalive = peer.get('keepalive', None),
- cork = peer.get('cork', 'nil') in ['t', 'true', 'y', 'yes', 'on'],
+ key = peer.get('key', None),
+ priv = peer.get('priv', None),
+ mobile = peer.get('mobile', 'nil') in booltrue,
+ cork = peer.get('cork', 'nil') in booltrue,
*addr)
except T.TripeError, exc:
raise T.TripeJobError(*exc.args)
*addr)
except T.TripeError, exc:
raise T.TripeJobError(*exc.args)