upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 23:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Return all names should be a set of names, not a list

Browse source
This commit is contained in:
James Kasten 2012-11-20 00:11:04 -05:00
parent c5a77bd360
commit e7e1aefe83
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
trustify/client/configurator.py
View file

@ -7,11 +7,11 @@ import socket
import time
import shutil
from trustify.client.CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES
#from CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES, REWRITE_HTTPS_ARGS
from trustify.client.CONFIG import REWRITE_HTTPS_ARGS
from trustify.client import logger
#import logger
#from trustify.client.CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES
from CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES, REWRITE_HTTPS_ARGS
#from trustify.client.CONFIG import REWRITE_HTTPS_ARGS
#from trustify.client import logger
import logger
#TODO - Need an initialization routine... make sure directories exist..ect
@ -149,14 +149,14 @@ class Configurator(object):
Returns all ServerNames, ServerAliases, and reverse DNS entries for
virtual host addresses
"""
all_names = []
all_names = set()
for v in self.vhosts:
all_names.extend(v.names)
all_names.update(v.names)
for a in v.addrs:
a_tup = a.partition(":")
try:
socket.inet_aton(a_tup[0])
all_names.append(socket.gethostbyaddr(a_tup[0])[0])
all_names.add(socket.gethostbyaddr(a_tup[0])[0])
except (socket.error, socket.herror, socket.timeout):
continue
@ -1054,8 +1054,8 @@ def main():
#config.save("Testing Saves", False)
#config.recover_checkpoint(1)
"""
config.display_checkpoints()
config.configtest()
#config.display_checkpoints()
#config.configtest()
"""
#config.make_vhost_ssl("/etc/apache2/sites-available/default")
# Testing redirection