From dd459a6147ed4f4fe3bfcbde4dda8e8ebcc979ad Mon Sep 17 00:00:00 2001 From: Nicolas Emiliani Date: Mon, 12 Nov 2007 13:14:24 -0300 Subject: [PATCH] VpnHandler bugfixes. --- pymin/services/vpn/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pymin/services/vpn/__init__.py b/pymin/services/vpn/__init__.py index 1e84361..d251640 100644 --- a/pymin/services/vpn/__init__.py +++ b/pymin/services/vpn/__init__.py @@ -1,8 +1,10 @@ # vim: set encoding=utf-8 et sw=4 sts=4 : import os +import signal from os import path + from pymin.seqtools import Sequence from pymin.dispatcher import Handler, handler, HandlerError from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \ @@ -106,10 +108,10 @@ class VpnHandler(Restorable, ConfigWriter, @handler('usage: stop ') def stop(self, vpn_src): if vpn_src in self.vpns: - if path.exists('/var/lib/run/tincd.' + vpn_src + '.pid'): - pid = file('/var/lib/run/tincd.' + vpn_src + '.pid').readline() + if path.exists('/var/run/tinc.' + vpn_src + '.pid'): + pid = file('/var/run/tinc.' + vpn_src + '.pid').readline() try: - os.kill(int(pid.strip()), SIGTERM) + os.kill(int(pid.strip()), signal.SIGTERM) except OSError: pass # XXX report error? -- 2.43.0