summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2019-11-22 14:51:12 +0100
committerkwadronaut <kwadronaut@leap.se>2020-01-07 17:11:16 +0100
commit10f825d96704ecac589f97aeba1de3dd116efb3a (patch)
tree2204ce9c910afcc9ad1b124ac3b6a6910535c1da
parent3929de54343df9ffa6044900dd5a7e27b664fe63 (diff)
Add chaperone.de directory
-rw-r--r--Dockerfile2
-rw-r--r--chaperone.d/vpnweb.conf4
2 files changed, 5 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 0fa5c10..b867132 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y -
ENV GOPATH=/go
WORKDIR $GOPATH
RUN go get -u 0xacab.org/leap/vpnweb
-RUN strip $GOPATH/leap/vpnweb
+RUN strip $GOPATH/bin/vpnweb
FROM registry.git.autistici.org/ai3/docker/chaperone-base
diff --git a/chaperone.d/vpnweb.conf b/chaperone.d/vpnweb.conf
new file mode 100644
index 0000000..1c10f09
--- /dev/null
+++ b/chaperone.d/vpnweb.conf
@@ -0,0 +1,4 @@
+vpnweb-server.service: {
+ command: "/bin/sh -c 'exec /usr/local/bin/vpnweb -caCrt ${CLIENT_CA.CRT:-/etc/leap/ca/client_ca.crt} -caKey ${CLIENT_CA.KEY:-/etc/leap/ca/client_ca.key} -notls }'",
+ exit_kills: false
+}