diff --git a/CHANGES.txt b/CHANGES.txt index 34024f8cdfa44dbdcda3730433ce5c869664da7d..c8746fd9f76e0a9fbddc5d872c51b8d2e2fbb828 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ -0.14 (2011-12-30) +0.14 (2012-01-09) ================= - * No change yet + * onetimeupload: SSL should be provided by an http frontend [Romain Courteaud] 0.13 (2011-12-30) ================= diff --git a/setup.py b/setup.py index 7fb37751f941c30e45f0f2d1b510dc2debe2fa5f..f347f9a7d4aca17447115ba2542ab17f7224efd0 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages import glob import os -version = '0.14-dev' +version = '0.14' name = 'slapos.toolbox' long_description = open("README.txt").read() + "\n" + \ open("CHANGES.txt").read() + "\n" diff --git a/slapos/onetimeupload/__init__.py b/slapos/onetimeupload/__init__.py index c403cf074b8f121119c49edb384b903511147d21..cd97177c5b84d14796e31af0c67108aa7d4f4448 100644 --- a/slapos/onetimeupload/__init__.py +++ b/slapos/onetimeupload/__init__.py @@ -104,7 +104,7 @@ def run(config): template = app.open_resource('templates/index.html') return template.read() - app.run(host=config.host, port=config.port, ssl_context='adhoc') + app.run(host=config.host, port=config.port) def main(): "Run default configuration."