test-example: Generate new style sites.conf

[secnet.git] / test-example / Dir.sd.mk

diff --git a/test-example/Dir.sd.mk b/test-example/Dir.sd.mk
index 4e0a1347c4fb418d57b4bf23c79464c91e9f3325..775eef6ae616e501b66fd381baf85c06dcb83f2f 100644 (file)
--- a/test-example/Dir.sd.mk
+++ b/test-example/Dir.sd.mk
@@ -1,13 +1,18 @@
-&TARGETS += & sites.conf inside.key outside.key rsa1-sites2.key all-privkeys
+&TARGETS += & sites.conf sites-nonego.conf
+&TARGETS += & inside.key outside.key rsa1-sites2.key all-privkeys
 
 include common.make
 
 &/%.key: &^/%.key.b64
        base64 -d <$< >$@.new && mv -f $@.new $@
 
+&sites-nonego.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
+       $(src)/make-secnet-sites --output-version=1 &^/sites $@
+
 &sites.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
        mkdir -p &pubkeys
-       $(src)/make-secnet-sites --output-version=1 &^/sites $@
+       &~/make-secnet-sites --pubkeys-dir=&pubkeys --pubkeys-install \
+               &^/sites $@.tmp && mv -f $@.tmp $@
 
 &clean::
        rm -rf &pubkeys