X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=make-secnet-sites;h=1caf53dc3dfd919f5bd65cb59ebb787e6b99f968;hb=3f9018da766b609a8249db1428359186d5356356;hp=f5795ee85c5684db50cf1b34fe85e8c57db01ea6;hpb=ef3d89ac47a35f16102b7b602763858c2ac6f3a8;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index f5795ee..1caf53d 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -253,6 +253,7 @@ def parse_args():
 	global key_prefix
 	global debug_level
 	global output_version
+	global pubkeys_dir
 
 	ap = argparse.ArgumentParser(description='process secnet sites files')
 	ap.add_argument('--userv', '-u', action='store_true',
@@ -260,6 +261,9 @@ def parse_args():
 	ap.add_argument('--conf-key-prefix', action=ActionNoYes,
 			default=True,
 		 help='prefix conf file key names derived from sites data')
+	ap.add_argument('--pubkeys-dir',  nargs=1,
+			help='public key directory',
+			default=['/var/lib/secnet/pubkeys'])
 	ap.add_argument('--output-version', nargs=1, type=int,
 			help='sites file output version',
 			default=[max_version])
@@ -274,6 +278,7 @@ def parse_args():
 	prefix = '' if av.prefix is None else av.prefix[0]
 	key_prefix = av.conf_key_prefix
 	output_version = av.output_version[0]
+	pubkeys_dir = av.pubkeys_dir[0]
 	if service:
 		if len(av.arg)!=4:
 			print("Wrong number of arguments")
@@ -619,6 +624,10 @@ class sitelevel(level):
 	 'peer':"Gateway address of the site",
 	 'pub':"public key of the site",
 	}
+	def mangle_name(self):
+		return self.name.replace('/',',')
+	def pubkeys_path(self):
+		return pubkeys_dir + '/peer.' + self.mangle_name()
 	def __init__(self,w):
 		level.__init__(self,w)
 	def output_data(self,w,path):