Merge pull request #2921 from minrk/token-env

allow setting token via JUPYTER_TOKEN env

Author: takluyver

notebook/notebookapp.py

@@ -662,6 +662,9 @@ def _write_cookie_secret_file(self, secret):
 
     @default('token')
     def _token_default(self):
+        if os.getenv('JUPYTER_TOKEN'):
+            self._token_generated = False
+            return os.getenv('JUPYTER_TOKEN')
         if self.password:
             # no token if password is enabled
             self._token_generated = False