From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Dec 2019 16:35:44 +0000 (+0000)
Subject: make-secnet-sites: Provide explicit --conf mode option
X-Git-Tag: v0.6.0~64
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=3f8b562ea10431add0ce06079f303f130d0280be

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 aa4b216..098cc8e 100644
--- 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 93bfc10..6e76636 100755
--- 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,