Issue 3574 - Update run.py to recognize adblockplus::host records

run.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import argparse
 import sys
 import os
 import posixpath
 import re
 import subprocess
 import yaml
@@ skipping 58 matching lines @@
             child.stdout.close()
             child.wait()
     elif options.remote is False:
         dirname = os.path.dirname(sys.argv[0])
         path_name = os.path.join(dirname, *path_canonical)
         with open(path_name, 'rb') as handle:
             config = yaml.load(handle)
     else:
         sys.exit('Please either specify a --remote host or use --local')
 
-    servers = config.get('servers', {})
+    servers = config.get('adblockplus::hosts', {})
     return servers
 
 
 def resolveHostList(options):
 
     result = set()
 
     try:
         valid_hosts = getValidHosts(options)
     except Warning as error:
         print >>sys.stderr, 'Warning: failed to determine valid hosts:', error
         result.update(options.hosts)
     else:
         for name in options.hosts:
             chunk = [
-                value.get('dns', key) for (key, value) in valid_hosts.items()
+                value.get('fqdn', key) for (key, value) in valid_hosts.items()
 
                 if name == key
                 or name == '*'
-                or name == value.get('dns', None)
+                or name == value.get('fqdn', None)
                 or name in value.get('groups', ())
             ]
 
             if len(chunk) == 0:
                 print >>sys.stderr, 'Warning: failed to recognize host or group', name
             else:
                 result.update(chunk)
 
     return result
 
 
 def runCommand(user, host, command, ignore_errors=False):
     if not isinstance(command, list):
         command = [command]
     command = ['ssh'] + (['-l', user] if user else []) + [host] + command
     if ignore_errors:
         subprocess.call(command)
     else:
         subprocess.check_call(command)
 
 if __name__ == '__main__':
     options = parseOptions(sys.argv[1:])
     selectedHosts = resolveHostList(options)
     if len(selectedHosts) == 0:
         print >>sys.stderr, 'No valid hosts or groups specified, nothing to do'
         sys.exit(0)
     for host in selectedHosts:
         print >>sys.stderr, 'Running on %s...' % host
         runCommand(options.user, host, options.args, options.ignore_errors)