Move more programs to integrated config+argparse framework.

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

3 files changed, 17 insertions, 17 deletions

diff --git a/rp/config/rpki-generate-root-certificate b/rp/config/rpki-generate-root-certificate
index a1a4d3a6..d4ee08fd 100755
--- a/rp/config/rpki-generate-root-certificate
+++ b/rp/config/rpki-generate-root-certificate
@@ -21,20 +21,20 @@ import rpki.resource_set
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-cfg, parser = rpki.config.argparser(section = "rootd", doc = __doc__)
+cfg = rpki.config.argparser(section = "rootd", doc = __doc__)
 
 default_certfile = cfg.get("rpki-root-cert-file", "root.cer")
 default_keyfile  = cfg.get("rpki-root-key-file",  "root.key")
 default_talfile  = os.path.splitext(default_certfile)[0] + ".tal"
 
-parser.add_argument("-a", "--asns",  help = "ASN resources",    default = "0-4294967295")
-parser.add_argument("-4", "--ipv4",  help = "IPv4 resources",   default = "0.0.0.0/0")
-parser.add_argument("-6", "--ipv6",  help = "IPv6 resources",   default = "::/0")
-parser.add_argument("--certificate", help = "certificate file", default = default_certfile)
-parser.add_argument("--key",         help = "key file",         default = default_keyfile)
-parser.add_argument("--tal",         help = "TAL file",         default = default_talfile)
+cfg.argparser.add_argument("-a", "--asns",  help = "ASN resources",    default = "0-4294967295")
+cfg.argparser.add_argument("-4", "--ipv4",  help = "IPv4 resources",   default = "0.0.0.0/0")
+cfg.argparser.add_argument("-6", "--ipv6",  help = "IPv6 resources",   default = "::/0")
+cfg.argparser.add_argument("--certificate", help = "certificate file", default = default_certfile)
+cfg.argparser.add_argument("--key",         help = "key file",         default = default_keyfile)
+cfg.argparser.add_argument("--tal",         help = "TAL file",         default = default_talfile)
 
-args = parser.parse_args()
+args = cfg.argparser.parse_args()
 
 resources = rpki.resource_set.resource_bag(
   asn = rpki.resource_set.resource_set_as(args.asns),
diff --git a/rp/config/rpki-sql-backup b/rp/config/rpki-sql-backup
index 097ad0d7..09e5856e 100755
--- a/rp/config/rpki-sql-backup
+++ b/rp/config/rpki-sql-backup
@@ -35,12 +35,12 @@ import rpki.config
 os.environ["TZ"] = "UTC"
 time.tzset()
 
-cfg, parser = rpki.config.argparser(doc = __doc__, section = "myrpki")
-parser.add_argument("-o", "--output", type = argparse.FileType("wb"), default = sys.stdout,
-                    help = "destination for SQL dump (default: stdout)")
-parser.add_argument("-v", "--verbose", action = "store_true",
-                    help = "whistle while you work")
-args = parser.parse_args()
+cfg = rpki.config.argparser(doc = __doc__, section = "myrpki")
+cfg.argparser.add_argument("-o", "--output", type = argparse.FileType("wb"), default = sys.stdout,
+                           help = "destination for SQL dump (default: stdout)")
+cfg.argparser.add_argument("-v", "--verbose", action = "store_true",
+                           help = "whistle while you work")
+args = cfg.argparser.parse_args()
 
 templates = dict(mysql      = "mysqldump --add-drop-database -u{username} -p{password} -B{database}",
                  sqlite3    = "sqlite3 {database} .dump",
diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng
index 4648e6c6..aee000e1 100755
--- a/rp/rcynic/rcynicng
+++ b/rp/rcynic/rcynicng
@@ -1388,8 +1388,8 @@ def main():
                       DJANGO_SETTINGS_MODULE = "rpki.django_settings.rcynic")
     time.tzset()
 
-    cfg, parser = rpki.config.argparser(section = "rcynic", doc = __doc__, cfg_optional = True)
-    rpki.log.argparse_setup(parser)
+    cfg = rpki.config.argparser(section = "rcynic", doc = __doc__, cfg_optional = True)
+    rpki.log.argparse_setup(cfg.argparser)
 
     cfg.add_argument("-u", "--unauthenticated",
                      help = "where to store unauthenticated data retrieved via rsycnc",
@@ -1435,7 +1435,7 @@ def main():
                              help = "whether to validate HTTPS server certificates")
 
     global args
-    args = parser.parse_args()
+    args = cfg.argparser.parse_args()
 
     rpki.log.init("rcynic", args)