diff options
| author | nicolargo <nicolas@nicolargo.com> | 2017-08-27 13:58:18 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2017-08-27 13:58:18 +0200 |
| commit | 7fc0f887e450e71772e3f64c913c6e3a132ef8e3 (patch) | |
| tree | 7869444df37d32d59ee939c0a3a8157e8ced3ce8 | |
| parent | ad4763eb431e43307d228f730c705f25fbe67d6d (diff) | |
| parent | 233ebc9608a7b193f2d93e8b4068ad53aa4e7685 (diff) | |
Merge branch 'master' into developv2.11
| -rw-r--r-- | glances/main.py | 6 | ||||
| -rw-r--r-- | glances/outputs/glances_bottle.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/glances/main.py b/glances/main.py index c63d91a3..69211d16 100644 --- a/glances/main.py +++ b/glances/main.py @@ -216,10 +216,6 @@ Examples of use: help='define a client/server username') parser.add_argument('--password', action='store_true', default=False, dest='password_prompt', help='define a client/server password') - parser.add_argument('--username-default', default=self.username, dest='username_default', - help='this option will be ignored if --username is specified') - parser.add_argument('--realm', default='glances', dest='realm', - help='used by Glances in web server mode when authentication is enabled') parser.add_argument('--snmp-community', default='public', dest='snmp_community', help='SNMP community') parser.add_argument('--snmp-port', default=161, type=int, @@ -321,7 +317,7 @@ Examples of use: description='Enter the Glances server username: ') else: # Default user name is 'glances' - args.username = args.username_default + args.username = self.username if args.password_prompt: # Interactive or file password diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index ee3cacf7..1cc4aa06 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -65,7 +65,7 @@ class GlancesBottle(object): self._app.install(EnableCors()) # Password if args.password != '': - self._app.install(auth_basic(self.check_auth, realm=args.realm)) + self._app.install(auth_basic(self.check_auth)) # Define routes self._route() |