Let synctl use a config directory.

synapse/config/__init__.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._base import ConfigError, find_config_files, read_config_files
+from ._base import ConfigError, find_config_files
 
-# export ConfigError, find_cofig_files, read_config_files if somebody does
+# export ConfigError, find_config_files, read_config_files if somebody does
 # import *
 # this is largely a fudge to stop PEP8 moaning about the import
-__all__ = ["ConfigError", "find_config_files", "read_config_files"]
+__all__ = ["ConfigError", "find_config_files"]

synctl

@@ -30,7 +30,7 @@ from six import iteritems
 
 import yaml
 
-from synapse.config import find_config_files, read_config_files
+from synapse.config import find_config_files
 
 SYNAPSE = [sys.executable, "-B", "-m", "synapse.app.homeserver"]
 
@@ -137,7 +137,7 @@ def main():
         "configfile",
         nargs="?",
         default="homeserver.yaml",
-        help="the homeserver config file, defaults to homeserver.yaml, may also specify"
+        help="the homeserver config file. Defaults to homeserver.yaml. May also be"
         " a directory with *.yaml files",
     )
     parser.add_argument(
@@ -179,7 +179,12 @@ def main():
         )
         sys.exit(1)
 
-    config = read_config_files(find_config_files([configfile]))
+    config_files = find_config_files([configfile])
+    config = {}
+    for config_file in config_files:
+        with open(config_file) as file_stream:
+            yaml_config = yaml.safe_load(file_stream)
+        config.update(yaml_config)
 
     pidfile = config["pid_file"]
     cache_factor = config.get("synctl_cache_factor")