From af43f7d13ee87eba58fe6e1fb29307671dd5a453 Mon Sep 17 00:00:00 2001 From: Romain Courteaud Date: Mon, 9 Jan 2012 17:06:47 +0100 Subject: [PATCH] SSL should be provided by an http frontend --- CHANGES.txt | 4 ++-- setup.py | 2 +- slapos/onetimeupload/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 34024f8..c8746fd 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 7fb3775..f347f9a 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 c403cf0..cd97177 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." -- 2.25.1