summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/cli
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-20 20:39:43 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:41:25 +0100
commit25ad6f18057ad7951f74eff35afe25d220952efa (patch)
treebfcb70fde93f73f993a3ae42f7c3def73464e105 /src/leap/bitmask/cli
parent9d7de357a114812c0ed1e04b97ef59b41a40fa47 (diff)
[refactor] rename eip to vpn
Diffstat (limited to 'src/leap/bitmask/cli')
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py20
-rw-r--r--src/leap/bitmask/cli/vpn.py (renamed from src/leap/bitmask/cli/eip.py)26
2 files changed, 26 insertions, 20 deletions
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/vpn.py
index f5c9795..ace8677 100644
--- a/src/leap/bitmask/cli/eip.py
+++ b/src/leap/bitmask/cli/vpn.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# eip
+# vpn
# Copyright (C) 2016-2017 LEAP
#
# This program is free software: you can redistribute it and/or modify
@@ -15,26 +15,26 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-Bitmask Command Line interface: eip
+Bitmask Command Line interface: vpn module
"""
from leap.bitmask.cli import command
-class Eip(command.Command):
- service = 'eip'
- usage = '''{name} eip <subcommand>
+class VPN(command.Command):
+ service = 'vpn'
+ usage = '''{name} vpn <subcommand>
-Bitmask Encrypted Internet Proxy Service
+Bitmask VPN 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
+ 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)