From 25ad6f18057ad7951f74eff35afe25d220952efa Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Mon, 20 Feb 2017 20:39:43 +0100 Subject: [refactor] rename eip to vpn --- src/leap/bitmask/cli/bitmask_cli.py | 20 +++++++++++------ src/leap/bitmask/cli/eip.py | 44 ------------------------------------- src/leap/bitmask/cli/vpn.py | 44 +++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 51 deletions(-) delete mode 100644 src/leap/bitmask/cli/eip.py create mode 100644 src/leap/bitmask/cli/vpn.py (limited to 'src/leap/bitmask/cli') diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index 933b824..0c037b2 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -25,14 +25,14 @@ import signal from colorama import Fore from twisted.internet import reactor, defer -from leap.bitmask.config import Configuration -from leap.bitmask.cli.eip import Eip +from leap.bitmask.cli import command from leap.bitmask.cli.keys import Keys +from leap.bitmask.cli.logs import Logs from leap.bitmask.cli.mail import Mail -from leap.bitmask.cli.webui import WebUI -from leap.bitmask.cli import command from leap.bitmask.cli.user import User -from leap.bitmask.cli.logs import Logs +from leap.bitmask.cli.vpn import VPN +from leap.bitmask.cli.webui import WebUI +from leap.bitmask.config import Configuration class BitmaskCLI(command.Command): @@ -44,10 +44,10 @@ SERVICE COMMANDS: user Handles Bitmask accounts mail Bitmask Encrypted Mail - eip Encrypted Internet Proxy + vpn Bitmask VPN keys Bitmask Keymanager ui Bitmask User Interface - logs Manages bitmask daemon logs + logs Manages the Bitmask daemon logs GENERAL COMMANDS: @@ -74,9 +74,15 @@ OPTIONAL ARGUMENTS: mail = Mail(self.cfg, self.print_json) return mail.execute(raw_args) +<<<<<<< HEAD def eip(self, raw_args): eip = Eip(self.cfg, self.print_json) return eip.execute(raw_args) +======= + def vpn(self, raw_args): + vpn = VPN() + return vpn.execute(raw_args) +>>>>>>> [refactor] rename eip to vpn def keys(self, raw_args): keys = Keys(self.cfg, self.print_json) diff --git a/src/leap/bitmask/cli/eip.py b/src/leap/bitmask/cli/eip.py deleted file mode 100644 index f5c9795..0000000 --- a/src/leap/bitmask/cli/eip.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -# eip -# Copyright (C) 2016-2017 LEAP -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -Bitmask Command Line interface: eip -""" -from leap.bitmask.cli import command - - -class Eip(command.Command): - service = 'eip' - usage = '''{name} eip - -Bitmask Encrypted Internet Proxy Service - -SUBCOMMANDS: - - enable Enable EIP Service - disable Disable EIP Service - start Start EIP - stop Stop EIP - status Display status about service - check Check whether EIP service is properly configured - get_cert Get EIP Certificate from provider - install Install helpers (needs root) - uninstall Uninstall helpers (needs root) - -'''.format(name=command.appname) - - commands = ['start', 'stop', 'status', 'check', - 'get_cert', 'install', 'uninstall'] diff --git a/src/leap/bitmask/cli/vpn.py b/src/leap/bitmask/cli/vpn.py new file mode 100644 index 0000000..ace8677 --- /dev/null +++ b/src/leap/bitmask/cli/vpn.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# vpn +# Copyright (C) 2016-2017 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Bitmask Command Line interface: vpn module +""" +from leap.bitmask.cli import command + + +class VPN(command.Command): + service = 'vpn' + usage = '''{name} vpn + +Bitmask VPN Service + +SUBCOMMANDS: + + enable Enable VPN Service + disable Disable VPN Service + start Start VPN + stop Stop VPN + status Display status about the VPN + check Check whether VPN service is properly configured + get_cert Get VPN Certificate from provider + install Install helpers (needs root) + uninstall Uninstall helpers (needs root) + +'''.format(name=command.appname) + + commands = ['start', 'stop', 'status', 'check', + 'get_cert', 'install', 'uninstall'] -- cgit v1.2.3