From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Jan 2012 11:50:25 +0000 (+0000)
Subject: make-secnet-sites: Actually include addresses in sites.conf
X-Git-Tag: debian/0.3.0_beta1~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=2489e9eb9441582ab9f3c33896d6ced309f0767b;hp=4a9b680b609b28274a8ae704819f3b59b4e3b4d7

make-secnet-sites: Actually include addresses in sites.conf

This was broken in

   commit c9d84e31f48a04eb0af525324707f22c738cc8b7
   Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
   Date:   Sat Dec 17 21:21:47 2011 +0000

       make-secnet-sites: Allow sites with no address

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 9e00720..dc6ec78 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -267,7 +267,7 @@ class sitelevel(level):
 	 'networks':None,
 	 'peer':None,
 	 'pubkey':(lambda n,v:"key %s;\n"%v),
-	 'address':None,
+	 'address':(lambda n,v:"address %s;\n"%v),
 	 'mobile':sp,
 	})
 	require_properties={