From 460fc1b711ebdd00bae5152b5a72058ab627cf8e Mon Sep 17 00:00:00 2001 From: Mitar Date: Sat, 11 Jun 2016 20:25:55 -0700 Subject: [PATCH] New way of running the broker. --- broker/contrib/tunneldigger.service | 3 ++- broker/contrib/tunneldigger.upstart | 3 ++- docs/server.rst | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/broker/contrib/tunneldigger.service b/broker/contrib/tunneldigger.service index d7a58e56..1f76e984 100644 --- a/broker/contrib/tunneldigger.service +++ b/broker/contrib/tunneldigger.service @@ -4,7 +4,8 @@ After=network.target auditd.service [Service] Type=simple -ExecStart=/home/tunneldigger/env/bin/python /home/tunneldigger/tunneldigger/broker/l2tp_broker.py /home/tunneldigger/tunneldigger/broker/l2tp_broker.cfg +WorkingDirectory=/home/tunneldigger/tunneldigger +ExecStart=/home/tunneldigger/env/bin/python -m broker.main /home/tunneldigger/tunneldigger/broker/l2tp_broker.cfg KillMode=process Restart=on-failure diff --git a/broker/contrib/tunneldigger.upstart b/broker/contrib/tunneldigger.upstart index 0b95bdee..5e70bbb2 100644 --- a/broker/contrib/tunneldigger.upstart +++ b/broker/contrib/tunneldigger.upstart @@ -5,4 +5,5 @@ stop on runlevel [!2345] respawn -exec /home/tunneldigger/env/bin/python /home/tunneldigger/tunneldigger/broker/l2tp_broker.py /home/tunneldigger/tunneldigger/broker/l2tp_broker.cfg +chdir /home/tunneldigger/tunneldigger +exec /home/tunneldigger/env/bin/python -m broker.main /home/tunneldigger/tunneldigger/broker/l2tp_broker.cfg diff --git a/docs/server.rst b/docs/server.rst index 26733aee..1a686993 100644 --- a/docs/server.rst +++ b/docs/server.rst @@ -107,7 +107,7 @@ Configuration ------------- The broker must be given a configuration file as first argument, an example of -which is provided in ``l2tp_broker.cfg``. There are some options that must be +which is provided in ``l2tp_broker.cfg.example``. There are some options that must be changed and some that can be left as default: * **address** should be configured with the external IP address that the clients will use to connect with the broker. @@ -176,3 +176,11 @@ Routing Daemon The example hook scripts require that the routing daemon (like ``olsrd``) be configured with the Tunneldigger bridge interfaces. + +Running +------- + +After you configured Tunneldigger, you can run the broker:: + + cd /srv/tunneldigger + /srv/env_tunneldigger/bin/python -m broker.main /srv/tunneldigger/broker/l2tp_broker.cfg