Merge branch 'refs/heads/develop' into tv

2013-08-24 14:30:09 +02:00
parent 8139016636 e013e38c5e
commit 73efd5549f
22 changed files with 301 additions and 104 deletions
@@ -214,7 +214,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
    # app.debug = development
    config = {
        'use_reloader': reloader,
-        'port': tryInt(Env.setting('port', default = 5000)),
+        'port': tryInt(Env.setting('port', default = 5050)),
        'host': host if host and len(host) > 0 else '0.0.0.0',
        'ssl_cert': Env.setting('ssl_cert', default = None),
        'ssl_key': Env.setting('ssl_key', default = None),