commit 2c526cfac89af29fa512f12fe027a55670c00ceb parent 32c0d2e65f4ce226e3e8fc1198431e4f1ffcfbb3 Author: Josuah Demangeon <mail@josuah.net> Date: Sun, 7 Oct 2018 05:33:20 +0200 Use a makefile to generate what's needed Diffstat:
| D | bin/netpgparmor | | | 9 | --------- |
| A | s6/curvevpn-server/data/Makefile | | | 5 | +++++ |
| A | s6/curvevpn-server/data/data | | | 0 | |
| A | s6/curvevpn-server/data/data.cdb | | | 0 | |
| M | s6/curvevpn-server/run | | | 2 | +- |
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/bin/netpgparmor b/bin/netpgparmor @@ -1,9 +0,0 @@ -#!/bin/sh -e - -test $# -gt 0 || set -- "$HOME/.gnupg/pubring.gpg" -test $# -eq 1 || { echo "usage: $0 [path-to-pgp-key]"; exit 1; } -ls "$1" >/dev/null - -printf -- '-----BEGIN PGP PUBLIC KEY BLOCK-----\n' -base64 "$1" -printf -- '-----END PGP PUBLIC KEY BLOCK-----\n' diff --git a/s6/curvevpn-server/data/Makefile b/s6/curvevpn-server/data/Makefile @@ -0,0 +1,5 @@ +data.cdb: data + curvevpn-data + +key: + curvevpn-makekey key diff --git a/s6/curvevpn-server/data/data b/s6/curvevpn-server/data/data diff --git a/s6/curvevpn-server/data/data.cdb b/s6/curvevpn-server/data/data.cdb Binary files differ. diff --git a/s6/curvevpn-server/run b/s6/curvevpn-server/run @@ -9,4 +9,4 @@ multisubstitute { importas EXT EXT } -curvevpn-server $NAME key $IP $PORT $EXT curvevpn +curvevpn-server $NAME data/key $IP $PORT $EXT curvevpn