make-secnet-sites: New --pubkeys-elide mode

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

diff --git a/README.make-secnet-sites b/README.make-secnet-sites
index 413bcf862c7b2959cebeb37a132ded143a89aeab..aa4b216d2f580f96f7dc8047bbc0bce7bc69b6cd 100644 (file)
--- a/README.make-secnet-sites
+++ b/README.make-secnet-sites
@@ -64,6 +64,12 @@ OPTIONS
                keys defined for any site, in the input.
                --pubkeys-single is the default.
 
                keys defined for any site, in the input.
                --pubkeys-single is the default.
 

+       --pubkeys-elide
+
+               In the sites.conf output, just write the peer-keys
+               entry referring to keys in PUBKEYS.  But do not write
+               public keys anywhere.
+

        --pubkeys-dir PUBKEYS
 
                Specifies the live pubkeys area pathname.
        --pubkeys-dir PUBKEYS
 
                Specifies the live pubkeys area pathname.

diff --git a/make-secnet-sites b/make-secnet-sites
index 16b124c9df5b9bc7d03e030d4c377d28d387cc02..6721156dd5dc945f19e9e3e6edad4526b1132382 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -282,6 +282,12 @@ class PkmInstall(PkmBase):
        def site_finish(self,confw):
                self._pw.close()
                os.rename(self._pa+'~tmp',self._pa+'~update')
        def site_finish(self,confw):
                self._pw.close()
                os.rename(self._pa+'~tmp',self._pa+'~update')

+               PkmElide.site_finish(self,confw)
+
+class PkmElide(PkmBase):
+       opt = 'elide'
+       help = 'no public keys in sites.conf output nor in directory'
+       def site_finish(self,confw):

                confw.write("peer-keys \"%s\";\n"%self._pa);
 
 def parse_args():
                confw.write("peer-keys \"%s\";\n"%self._pa);
 
 def parse_args():


@@ -314,6 +320,7 @@ def parse_args():
                        help=how().help)
        add_pkm(PkmInstall)
        add_pkm(PkmSingle)
                        help=how().help)
        add_pkm(PkmInstall)
        add_pkm(PkmSingle)

+       add_pkm(PkmElide)

        ap.add_argument('--pubkeys-dir',  nargs=1,
                        help='public key directory',
                        default=['/var/lib/secnet/pubkeys'])
        ap.add_argument('--pubkeys-dir',  nargs=1,
                        help='public key directory',
                        default=['/var/lib/secnet/pubkeys'])