diff options
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/irdbd.py | 4 | ||||
| -rw-r--r-- | rpki/old_irdbd.py | 4 | ||||
| -rw-r--r-- | rpki/pubd.py | 4 | ||||
| -rw-r--r-- | rpki/rootd.py | 4 | ||||
| -rw-r--r-- | rpki/rpkid.py | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/rpki/irdbd.py b/rpki/irdbd.py index 856f91bf..64460c30 100644 --- a/rpki/irdbd.py +++ b/rpki/irdbd.py @@ -153,8 +153,6 @@ 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", @@ -166,7 +164,7 @@ class main(object): rpki.log.init("irdbd", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd") + self.cfg = rpki.config.parser(section = "irdbd") self.cfg.set_global_flags() if not args.foreground: diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py index bb75ae5b..c5ce2278 100644 --- a/rpki/old_irdbd.py +++ b/rpki/old_irdbd.py @@ -281,8 +281,6 @@ 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) @@ -290,7 +288,7 @@ class main(object): rpki.log.init("irdbd", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd") + self.cfg = rpki.config.parser(section = "irdbd") startup_msg = self.cfg.get("startup-message", "") if startup_msg: diff --git a/rpki/pubd.py b/rpki/pubd.py index cf5b1b6a..cb9da32c 100644 --- a/rpki/pubd.py +++ b/rpki/pubd.py @@ -53,8 +53,6 @@ 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", @@ -68,7 +66,7 @@ class main(object): rpki.log.init("pubd", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "pubd") + self.cfg = rpki.config.parser(section = "pubd") self.cfg.set_global_flags() if not args.foreground: diff --git a/rpki/rootd.py b/rpki/rootd.py index 41c9e656..e912a846 100644 --- a/rpki/rootd.py +++ b/rpki/rootd.py @@ -338,8 +338,6 @@ 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", @@ -349,7 +347,7 @@ class main(object): rpki.log.init("rootd", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "rootd") + self.cfg = rpki.config.parser(section = "rootd") self.cfg.set_global_flags() if not args.foreground: diff --git a/rpki/rpkid.py b/rpki/rpkid.py index db81d56f..13be2fd2 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -60,8 +60,6 @@ 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", @@ -75,7 +73,7 @@ class main(object): rpki.log.init("rpkid", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "rpkid") + self.cfg = rpki.config.parser(section = "rpkid") self.cfg.set_global_flags() if not args.foreground: |