make-secnet-sites: Provide explicit --conf mode option

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

diff --git a/README.make-secnet-sites b/README.make-secnet-sites
index aa4b216d2f580f96f7dc8047bbc0bce7bc69b6cd..098cc8ec81d548c90f0235c7917ae235b8fb83e3 100644 (file)
--- a/README.make-secnet-sites
+++ b/README.make-secnet-sites
@@ -1,6 +1,6 @@
 USAGE
 
-       make-secnet-sites [-P PREFIX] [IN [OUT]]
+       make-secnet-sites [-P PREFIX] [--conf] [IN [OUT]]
        make-secnet-sites -u HEADER GRPDIR SITESFILE GROUP
 
        The `-P' option sets the PREFIX string, mentioned below in

diff --git a/make-secnet-sites b/make-secnet-sites
index 93bfc10e427c6cf778a317fac7490c06b3b32d07..6e76636c1d30a4f3f4104a8e259e1041d9a52be6 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -312,6 +312,8 @@ class OpBase():
                os.rename(self.sitesfile+"-tmp",self.sitesfile)
 
 class OpConf(OpBase):
+       opts = ['--conf']
+       help = 'sites.conf generation mode (default)'
        def is_service(self): return 0
        def positional_args(self, av):
                if len(av.arg)>3:
@@ -402,6 +404,7 @@ def parse_args():
                        nargs=0,
                        fn=(lambda v,ns,*x: setattr(ns,'opmode',how)),
                        help=how().help)
+       add_opmode(OpConf)
        add_opmode(OpUserv)
        ap.add_argument('--conf-key-prefix', action=ActionNoYes,
                        default=True,