From 10f825d96704ecac589f97aeba1de3dd116efb3a Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Fri, 22 Nov 2019 14:51:12 +0100
Subject: Add chaperone.de directory

---
 Dockerfile              | 2 +-
 chaperone.d/vpnweb.conf | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 chaperone.d/vpnweb.conf

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
+}
-- 
cgit v1.2.3