X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=make-secnet-sites;h=403782bb1f32edb3d7f176728b327cf9bf872ab1;hb=a15faeb2b12e9cc0e3d1352cf4c233fc61c51c1c;hp=8e3ec7360f0379d40d4dda703965a5217281225a;hpb=00152558bd7f5c51096fd2fa83e8609aa02aa29c;p=secnet.git diff --git a/make-secnet-sites b/make-secnet-sites index 8e3ec73..403782b 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -148,7 +148,7 @@ keywords={ 'networks':(networks,"Claimed networks"), 'pubkey':(rsakey,"RSA public site key"), 'peer':(single_ipaddr,"Tunnel peer IP address"), - 'address':(address,"External contact address and port") + 'address':(address,"External contact address and port"), } def sp(name,value): @@ -165,7 +165,7 @@ global_properties={ 'setup-retries':sp, 'wait-time':sp, 'renegotiate-time':sp, - 'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value) + 'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value), } class level: @@ -252,7 +252,7 @@ class sitelevel(level): 'address':sp, 'networks':None, 'peer':None, - 'pubkey':(lambda n,v:"key %s;\n"%v) + 'pubkey':(lambda n,v:"key %s;\n"%v), }) require_properties={ 'dh':"Diffie-Hellman group", @@ -261,7 +261,7 @@ class sitelevel(level): 'networks':"Networks claimed by the site", 'hash':"hash function", 'peer':"Gateway address of the site", - 'pubkey':"RSA public key of the site" + 'pubkey':"RSA public key of the site", } def __init__(self,w): level.__init__(self,w)