Merge branch 'master' into develop

nicolargo · Aug 27, 2017 · 7fc0f88 · 7fc0f88
2 parents ad4763e + 233ebc9
commit 7fc0f88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/glances/main.py b/glances/main.py
@@ -216,10 +216,6 @@ def init_args(self):
                             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 @@ def parse_args(self):
                     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
@@ -65,7 +65,7 @@ def __init__(self, config=None, args=None):
         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()