From e78c6e83f987817f722a36fc0e0937149a15f791 2011-08-25 18:43:58 From: Brian E. Granger Date: 2011-08-25 18:43:58 Subject: [PATCH] Merge branch 'fix/https' of https://github.com/satra/ipython into satra-fix/https --- diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 6a9e379..5821481 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -263,7 +263,10 @@ class IPythonNotebookApp(BaseIPythonApplication): def start(self): ip = self.ip if self.ip else '[all ip addresses on your system]' - self.log.info("The IPython Notebook is running at: http://%s:%i" % (ip, self.port)) + proto = 'https' if self.certfile else 'http' + self.log.info("The IPython Notebook is running at: %s://%s:%i" % (proto, + ip, + self.port)) ioloop.IOLoop.instance().start() #----------------------------------------------------------------------------- diff --git a/docs/source/interactive/htmlnotebook.txt b/docs/source/interactive/htmlnotebook.txt index 7e4cbee..e7e102a 100644 --- a/docs/source/interactive/htmlnotebook.txt +++ b/docs/source/interactive/htmlnotebook.txt @@ -26,8 +26,19 @@ you want inline figures, you must manually select the ``inline`` backend:: $ ipython notebook --pylab=inline +You can start the notebook to communicate via a secure protocol mode using a +self-signed certificate by typing:: + + $ ipython notebook --certfile=mycert.pem + +.. note:: + + A self-signed certificate can be generated with openssl. For example: + + openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout mycert.pem -out mycert.pem + This server uses the same ZeroMQ-based two process kernel architecture as -the QT Console as well Tornado for serving HTTP requests. Some of the main +the QT Console as well Tornado for serving HTTP/S requests. Some of the main features of the Notebook include: * Display rich data (png/html/latex/svg) in the browser as a result of