test-example: all-privkeys: Define, and indirect through, a variable

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 16b124c9df5b9bc7d03e030d4c377d28d387cc02..9e4538b01e4f719ea3ece7ad6d1396dd53edd106 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')
+               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():
@@ -314,6 +320,7 @@ def parse_args():
                        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'])
@@ -490,7 +497,7 @@ class pubkey (inpub):
                return len(self.forpub(version,fs)) != 0
 
 class rsakey (pubkey):
-       "An RSA public key"
+       "An old-style RSA public key"
        def __init__(self,w):
                self.l=w[1].number(0,max['rsa_bits'],'rsa len')
                self.e=w[2].bignum_10('rsa','rsa e')
@@ -576,7 +583,7 @@ keywords={
  'pkg':(listof(somepubkey),"start of public key group",'pub'),
  'pkgf':(listof(somepubkey),"start of fallback public key group",'pub'),
  'pub':(listof(somepubkey),"new style public site key"),
- 'pubkey':(listof(somepubkey),"RSA public site key",'pub'),
+ 'pubkey':(listof(somepubkey),"Old-style RSA public site key",'pub'),
  'peer':(single_ipaddr,"Tunnel peer IP address"),
  'address':(address,"External contact address and port"),
  'mobile':(boolean,"Site is mobile"),