From a88e0a59af5944df4ba2d8488533d1bde9a2faea Mon Sep 17 00:00:00 2001
From: Jefferson Stachelski <jstachel@thoughtworks.com>
Date: Wed, 15 Apr 2015 19:15:51 -0300
Subject: pixelated-dispatcher#91 Renamed some arguments and replaced all words
 'leap' and 'provider' by 'LEAP provider'

---
 service/pixelated/config/args.py      | 6 +++---
 service/pixelated/config/leap_cert.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'service')

diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py
index 7c4f02dc..0eedae55 100644
--- a/service/pixelated/config/args.py
+++ b/service/pixelated/config/args.py
@@ -29,7 +29,7 @@ def parse():
     parser.add_argument('-sk', '--sslkey', metavar='<server.key>', default=None, help='use specified file as web server\'s SSL key (when using the user-agent together with the pixelated-dispatcher)')
     parser.add_argument('-sc', '--sslcert', metavar='<server.crt>', default=None, help='use specified file as web server\'s SSL certificate (when using the user-agent together with the pixelated-dispatcher)')
     parser.add_argument('--register', metavar=('provider', 'username'),
-                        nargs=2, help='register a new username on the desired provider')
+                        nargs=2, help='register a new username on the desired LEAP provider')
     args = parser.parse_args()
     return args
 
@@ -39,5 +39,5 @@ def parser_add_default_arguments(parser):
     parser.add_argument('--dispatcher', help='run in organization mode, the credentials will be read from specified file', metavar='file')
     parser.add_argument('--dispatcher-stdin', help='run in organization mode, the credentials will be read from stdin', default=False, action='store_true', dest='dispatcher_stdin')
     parser.add_argument('--home', help='The folder where the user agent stores its data. Defaults to ~/.leap', default=DEFAULT_LEAP_HOME)
-    parser.add_argument('-lc', '--leap-cert', metavar='<leap.crt>', default=None, help='use specified file for LEAP cert authority certificate (url https://<provider-domain>/ca.crt)')
-    parser.add_argument('--leap-cert-fingerprint', metavar='<leap certificate fingerprint>', default=None, help='use specified fingerprint to validate connection with leap provider', dest='leap_cert_fingerprint')
+    parser.add_argument('-lc', '--leap-provider-cert', metavar='<leap-provider.crt>', default=None, help='use specified file for LEAP provider cert authority certificate (url https://<LEAP-provider-domain>/ca.crt)')
+    parser.add_argument('-lf', '--leap-provider-cert-fingerprint', metavar='<leap provider certificate fingerprint>', default=None, help='use specified fingerprint to validate connection with LEAP provider', dest='leap_provider_cert_fingerprint')
diff --git a/service/pixelated/config/leap_cert.py b/service/pixelated/config/leap_cert.py
index 22f73720..568f76d9 100644
--- a/service/pixelated/config/leap_cert.py
+++ b/service/pixelated/config/leap_cert.py
@@ -18,9 +18,9 @@ import pixelated.bitmask_libraries.certs as certs
 
 
 def init_leap_cert(args):
-    if args.leap_cert_fingerprint is None:
-        certs.LEAP_CERT = args.leap_cert or True
+    if args.leap_provider_cert_fingerprint is None:
+        certs.LEAP_CERT = args.leap_provider_cert or True
         certs.LEAP_FINGERPRINT = None
     else:
-        certs.LEAP_FINGERPRINT = args.leap_cert_fingerprint
+        certs.LEAP_FINGERPRINT = args.leap_provider_cert_fingerprint
         certs.LEAP_CERT = False
-- 
cgit v1.2.3