diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-04-16 09:38:41 +0200 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-04-16 09:55:36 +0200 |
| commit | 96d91ef98069f0c5148cdef9fb694b8e216847df (patch) | |
| tree | 436882870862c4a16559791238a9120e20902d8c | |
| parent | 1409c300e6e72e5c00f891205beb71c4fa9015bb (diff) | |
maintenance reads credentials from stdin.
- Issue #345
| -rw-r--r-- | service/pixelated/config/args.py | 2 | ||||
| -rw-r--r-- | service/pixelated/maintenance.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py index 0eedae55..a5d19369 100644 --- a/service/pixelated/config/args.py +++ b/service/pixelated/config/args.py @@ -25,7 +25,6 @@ def parse(): parser.add_argument('--host', default='127.0.0.1', help='the host to run the user agent on') parser.add_argument('--port', type=int, default=3333, help='the port to run the user agent on') - parser.add_argument('-c', '--config', metavar='<configfile>', default=None, help='use specified file for credentials (for test purposes only)') 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'), @@ -38,6 +37,7 @@ def parser_add_default_arguments(parser): parser.add_argument('--debug', action='store_true', help='DEBUG mode.') 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('-c', '--config', metavar='<configfile>', default=None, help='use specified file for credentials (for test purposes only)') 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-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/maintenance.py b/service/pixelated/maintenance.py index 6beeb2fd..9a621476 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -67,9 +67,12 @@ def initialize(): init_logging(args) init_leap_cert(args) - init_events_server() + if args.dispatcher or args.dispatcher_stdin: + config_dispatcher(app, args) + else: + config_user_agent(app, args) - config_dispatcher(app, args) + init_events_server() def execute_command(): |