Fix csv reading
This commit is contained in:
@@ -1482,18 +1482,17 @@ def checkWildcardExist(self, wo_domain_name):
|
|||||||
with open('/var/lib/wo/cert.csv', 'rt') as wo_cert:
|
with open('/var/lib/wo/cert.csv', 'rt') as wo_cert:
|
||||||
reader = csv.reader(wo_cert, 'acmeconf')
|
reader = csv.reader(wo_cert, 'acmeconf')
|
||||||
wo_wildcard = "*.{0}".format(wo_domain_name)
|
wo_wildcard = "*.{0}".format(wo_domain_name)
|
||||||
try:
|
try:
|
||||||
for row in reader:
|
for row in reader:
|
||||||
if wo_wildcard in row[2]:
|
if wo_wildcard in row[2]:
|
||||||
break
|
break
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
except csv.Error as e:
|
except csv.Error as e:
|
||||||
Log.debug(self, "{0}".format(e))
|
Log.debug(self, "{0}".format(e))
|
||||||
Log.error(self, "Failed to read cert list")
|
Log.error(self, "Failed to read cert list")
|
||||||
finally:
|
|
||||||
wo_cert.close()
|
|
||||||
|
|
||||||
# copy wildcard certificate to a subdomain
|
# copy wildcard certificate to a subdomain
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user