We are going to introduce some new public keys in the sites file but
for now we don't want to change the sites.conf output. This is what
--output-version is for.
Later we will relegate this to compatibility tests, and make the new
approach the default.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
source mtest/common.tcl
-run-mss --no-conf-key-prefix test-example/sites $tmp/out.conf
+run-mss --no-conf-key-prefix --output-version=1 test-example/sites $tmp/out.conf
set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
diff mtest/e-basic.conf $tmp/out.conf $seddery
source mtest/common.tcl
-run-mss -Ppprefix --no-conf-key-prefix test-example/sites $tmp/out.conf
+run-mss -Ppprefix --no-conf-key-prefix --output-version=1 test-example/sites $tmp/out.conf
diff mtest/e-basic.conf $tmp/out.conf \
"sed -e 's/vpn/pprefixvpn/g; s/^all-sites/pprefix&/' | $seddery" \
&sites.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
mkdir -p &pubkeys
- $(src)/make-secnet-sites &^/sites $@
+ $(src)/make-secnet-sites --output-version=1 &^/sites $@
&clean::
rm -rf &pubkeys