More PID handling fixes

Dockerfile

@@ -12,7 +12,8 @@ RUN apt-get update -qq \
  && apt-get install -y -qq \
   python3-pip \
   openvpn \
-  strongswan
+  strongswan \
+  libcharon-extra-plugins
 
 # Dump on console what modules StrongSwan attempts to load
 RUN echo '#!/bin/bash' > /usr/sbin/modprobe \

entrypoint-openvpn.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
-rm -fv /run/certidude/*.pid
-sleep 10
 set -e
+set -x
+rm -fv /run/*.pid /var/run/*.pid /run/*/*.pid /var/run/*/*.pid
+sleep 10
 $@
 AUTHORITY=$3
 test -f /etc/certidude/authority/$AUTHORITY/host_cert.pem

entrypoint-strongswan.sh

@@ -1,8 +1,10 @@
 #!/bin/sh
-rm -fv /run/certidude/*.pid
-sleep 10
 set -e
+set -x
+rm -fv /run/*.pid /var/run/*.pid /run/*/*.pid /var/run/*/*.pid
+sleep 10
 $@
 AUTHORITY=$3
 test -f /etc/certidude/authority/$AUTHORITY/host_cert.pem
+/usr/sbin/ipsec stop
 /usr/sbin/ipsec start --nofork