At this point I'm pretty sure that removing the --config options from

daemons was pointless, so back that out before removing branches/tk713.

svn path=/branches/tk705/; revision=5958

5 files changed, 15 insertions, 5 deletions

diff --git a/rpki/irdbd.py b/rpki/irdbd.py
index 2b697cc8..e51f2e75 100644
--- a/rpki/irdbd.py
+++ b/rpki/irdbd.py
@@ -149,6 +149,8 @@ class main(object):
     time.tzset()
 
     parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
     parser.add_argument("-f", "--foreground", action = "store_true",
                         help = "do not daemonize")
     parser.add_argument("--pidfile",
@@ -160,7 +162,7 @@ class main(object):
 
     rpki.log.init("irdbd", args)
 
-    self.cfg = rpki.config.parser(section = "irdbd")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd")
     self.cfg.set_global_flags()
 
     if not args.foreground:
diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py
index 3fd476f2..10024290 100644
--- a/rpki/old_irdbd.py
+++ b/rpki/old_irdbd.py
@@ -272,6 +272,8 @@ class main(object):
     time.tzset()
 
     parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
     parser.add_argument("-f", "--foreground", action = "store_true",
                         help = "do not daemonize (ignored, old_irdbd never daemonizes)")
     rpki.log.argparse_setup(parser)
@@ -279,7 +281,7 @@ class main(object):
 
     rpki.log.init("irdbd", args)
 
-    self.cfg = rpki.config.parser(section = "irdbd")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd")
 
     startup_msg = self.cfg.get("startup-message", "")
     if startup_msg:
diff --git a/rpki/pubd.py b/rpki/pubd.py
index fe7987d1..335da0e6 100644
--- a/rpki/pubd.py
+++ b/rpki/pubd.py
@@ -93,6 +93,8 @@ class main(object):
     self.irbe_cms_timestamp = None
 
     parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
     parser.add_argument("-f", "--foreground", action = "store_true",
                         help = "do not daemonize")
     parser.add_argument("--pidfile",
@@ -106,7 +108,7 @@ class main(object):
 
     rpki.log.init("pubd", args)
 
-    self.cfg = rpki.config.parser(section = "pubd")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "pubd")
     self.cfg.set_global_flags()
 
     if not args.foreground:
diff --git a/rpki/rootd.py b/rpki/rootd.py
index 6b6aa0fa..4ded1081 100644
--- a/rpki/rootd.py
+++ b/rpki/rootd.py
@@ -428,6 +428,8 @@ class main(object):
     time.tzset()
 
     parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
     parser.add_argument("-f", "--foreground", action = "store_true",
                         help = "do not daemonize")
     parser.add_argument("--pidfile",
@@ -437,7 +439,7 @@ class main(object):
 
     rpki.log.init("rootd", args)
 
-    self.cfg = rpki.config.parser(section = "rootd")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "rootd")
     self.cfg.set_global_flags()
 
     if not args.foreground:
diff --git a/rpki/rpkid.py b/rpki/rpkid.py
index e9a05abb..a338f7e6 100644
--- a/rpki/rpkid.py
+++ b/rpki/rpkid.py
@@ -60,6 +60,8 @@ class main(object):
     self.task_queue = []
 
     parser = argparse.ArgumentParser(description = __doc__)
+    parser.add_argument("-c", "--config",
+                        help = "override default location of configuration file")
     parser.add_argument("-f", "--foreground", action = "store_true",
                         help = "do not daemonize")
     parser.add_argument("--pidfile",
@@ -73,7 +75,7 @@ class main(object):
 
     rpki.log.init("rpkid", args)
 
-    self.cfg = rpki.config.parser(section = "rpkid")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "rpkid")
     self.cfg.set_global_flags()
 
     if not args.foreground: