diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2013-04-13 15:01:53 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2013-04-13 15:01:53 +0200 |
commit | a5772fb74fbb0c2a8dbaa81449a76ee69fa20556 (patch) | |
tree | 8aee4a67baf33deef34debb202bd9b7393362a1b | |
parent | c1ef003f69ae563bcc8d543a6c397f08cb930628 (diff) |
Rename cert, ignore local cert files for git.
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | slideapi.py | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,4 @@ *~ /local.json /filestore +/server.* diff --git a/slideapi.py b/slideapi.py index ecfdeff..7c78a0e 100755 --- a/slideapi.py +++ b/slideapi.py @@ -7,7 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -import os, json, time, _cpwsgiserver3 +import os, json, time +from cherrypy2 import _cpwsgiserver3 from bottle import get, post, auth_basic, run, static_file, request from bottle import debug, view, HTTPError, server_names, ServerAdapter from subprocess import call @@ -219,7 +220,7 @@ def home_page(): class SSLInterface(ServerAdapter): def run(self, handler): server = _cpwsgiserver3.CherryPyWSGIServer((self.host, self.port), handler) - cert = 'bottletest.pem' + cert = 'server.pem' server.ssl_certificate = cert server.ssl_private_key = cert try: |