config: Break out read_config (and change default config files a bit)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py
index bf599e7..e8a502f 100644 (file)
--- a/hippotatlib/__init__.py
+++ b/hippotatlib/__init__.py
@@ -562,6 +562,11 @@ def common_startup(process_cfg):
     need_defcfg = False
     readconfig(value)
 
     need_defcfg = False
     readconfig(value)
 

+  def read_defconfig():
+    readconfig('/etc/hippotat/config.d', False)
+    readconfig('/etc/hippotat/passwords.d', False)
+    readconfig('/etc/hippotat/master.cfg',   False)
+

   def dfs_less_detailed(dl):
     return [df for df in DBG.iterconstants() if df <= dl]
 
   def dfs_less_detailed(dl):
     return [df for df in DBG.iterconstants() if df <= dl]
 


@@ -629,8 +634,7 @@ just `+': all DFLAGs.
   if len(args): optparser.error('no non-option arguments please')
 
   if need_defcfg:
   if len(args): optparser.error('no non-option arguments please')
 
   if need_defcfg:

-    readconfig('/etc/hippotat/config',   False)
-    readconfig('/etc/hippotat/config.d', False)
+    read_defconfig()

 
   try:
     (pss, pcs) = _cfg_process_putatives()
 
   try:
     (pss, pcs) = _cfg_process_putatives()