Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from radiorabe/fix/tls-api-client 

Fix TLS support
This commit is contained in:
Robb 2017-03-20 23:34:42 -04:00 committed by GitHub
parent 81d3c3e2b8 d20965131c
commit 0ac58165a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python_apps/api_clients/api_clients/api_client.py
View File

@ -187,7 +187,7 @@ class RequestProvider(object):
if self.config["general"]["base_dir"].startswith("/"):
self.config["general"]["base_dir"] = self.config["general"]["base_dir"][1:]
self.url = ApcUrl("%s://%s:%s/%s%s/%s" \
% (str(("https", "http")[self.config["general"]["base_port"] == 443]),
% (str(("http", "https")[int(self.config["general"]["base_port"]) == 443]),
self.config["general"]["base_url"], str(self.config["general"]["base_port"]),
self.config["general"]["base_dir"], self.config["api_base"],
'%%action%%'))
@ -325,7 +325,7 @@ class AirtimeApiClient(object):
if self.config["general"]["base_dir"].startswith("/"):
self.config["general"]["base_dir"] = self.config["general"]["base_dir"][1:]
url = "%s://%s:%s/%s%s/%s" % \
(str(("https", "http")[self.config["general"]["base_port"] == 443]),
(str(("http", "https")[int(self.config["general"]["base_port"]) == 443]),
self.config["general"]["base_url"], str(self.config["general"]["base_port"]),
self.config["general"]["base_dir"], self.config["api_base"],
self.config[config_action_key])