From e7e1aefe83399cca2e0495dbb46437d95442f740 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Tue, 20 Nov 2012 00:11:04 -0500 Subject: [PATCH] Return all names should be a set of names, not a list --- trustify/client/configurator.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/trustify/client/configurator.py b/trustify/client/configurator.py index 691d4d39d..cdff5adc1 100644 --- a/trustify/client/configurator.py +++ b/trustify/client/configurator.py @@ -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