mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-11-08 03:03:00 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'socket/unix-socket' into Develop

Browse Source
This commit is contained in:
Ozzieisaacs
2019-06-21 09:46:03 +02:00
parent 5c7aeb2f2c e254565901
commit cc8a431532
8 changed files with 187 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cps/ub.py
View File

@@ -476,35 +476,22 @@ class Config:
def get_config_certfile(self):
if cli.certfilepath:
return cli.certfilepath
else:
if cli.certfilepath is "":
return None
else:
return self.config_certfile
if cli.certfilepath is "":
return None
return self.config_certfile
def get_config_keyfile(self):
if cli.keyfilepath:
return cli.keyfilepath
else:
if cli.certfilepath is "":
return None
else:
return self.config_keyfile
if cli.certfilepath is "":
return None
return self.config_keyfile
def get_config_ipaddress(self, readable=False):
if not readable:
if cli.ipadress:
return cli.ipadress
else:
return ""
else:
answer="0.0.0.0"
if cli.ipadress:
if cli.ipv6:
answer = "["+cli.ipadress+"]"
else:
answer = cli.ipadress
return answer
def get_config_ipaddress(self):
return cli.ipadress or ""
def get_ipaddress_type(self):
return cli.ipv6
def _has_role(self, role_flag):
return constants.has_flag(self.config_default_role, role_flag)