Merge pull request #90 from dappnode/v0.1.18

V0.1.18

build/src/init.sh

@@ -142,7 +142,7 @@ modprobe af_key
 
 # Start services
 mkdir -p /var/run/pluto /var/run/xl2tpd
-rm -f /var/run/pluto/pluto.pid /var/run/xl2tpd.pid
+rm -f /var/run/xl2tpd.pid
 
 touch /var/run/dnp_vpn 
 

build/src/ipsec

@@ -37,15 +37,20 @@ start() {
 }
 
 stop() {
- if [ "${RC_CMD}" = "restart" ] ; then
- checkconfig || return 1
+ if [ "${RC_CMD}" = "restart" ] ; then
+ checkconfig || return 1
+ fi
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile "${PLUTO_PIDFILE}"
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+ ebegin "Stopping (killing it)"
+ start-stop-daemon --stop -s SIGKILL --pidfile "${PLUTO_PIDFILE}" 
  fi
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile "${PLUTO_PIDFILE}"
- RETVAL=$?
  ${IPSEC_BINARY} _stackmanager stop
  ${IPSEC_BINARY} --stopnflog
- eend $RETVAL
+ eend $? 
+
 }
 
 reload() {

dappnode_package.json

@@ -1,6 +1,6 @@
 {
  "name": "vpn.dnp.dappnode.eth",
- "version": "0.1.15",
+ "version": "0.1.18",
  "description": "Dappnode package responsible for providing the VPN (L2TP/IPSec) connection",
  "avatar": "/ipfs/QmWwMb3XhuCH6JnCF6m6EQzA4mW9pHHtg7rqAfhDr2ofi8",
  "type": "dncore",
@@ -24,8 +24,9 @@
  "subnet": "172.33.0.0/16",
  "ipv4_address": "172.33.1.4"
  },
- "author": "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",
+ "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
  "contributors": [
+ "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",
  "DAppLion <dapplion@giveth.io> (https://github.com/dapplion)",
  "Alex Floyd <alex@giveth.io> (https://github.com/mex20)"
  ],
@@ -37,7 +38,7 @@
  ],
  "homepage": {
  "userui": "https://dappnode.github.io/DAppNode_OTP",
- "homepage": "https://github.com/dappnode/DNP_BIND#readme"
+ "homepage": "https://github.com/dappnode/DNP_VPN#readme"
  },
  "repository": {
  "type": "git",

docker-compose-vpn.yml

@@ -1,32 +1,30 @@
-version: "3.4"
-
+version: '3.4'
 networks:
- network:
- driver: bridge
- ipam:
- config:
- - subnet: 172.33.0.0/16
-
+  network:
+  driver: bridge
+  ipam:
+  config:
+  -
+ subnet: 172.33.0.0/16
 volumes:
- vpndnpdappnodeeth_data: {}
-
+ vpndnpdappnodeeth_data: {}
 services:
- vpn.dnp.dappnode.eth:
- build: ./build
- image: vpn.dnp.dappnode.eth:0.1.15
- container_name: DAppNodeCore-vpn.dnp.dappnode.eth
- privileged: true
- restart: always
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- - /etc/hostname:/etc/vpnname:ro
- - /usr/src/dappnode/config:/usr/src/app/config:ro
- - /lib/modules:/lib/modules:ro
- - vpndnpdappnodeeth_data:/usr/src/app/secrets
- ports:
- - 4500:4500/udp
- - 500:500/udp
- dns: 172.33.1.2
- networks:
- network:
- ipv4_address: 172.33.1.4
+  vpn.dnp.dappnode.eth:
+  build: ./build
+  image: 'vpn.dnp.dappnode.eth:0.1.18'
+  container_name: DAppNodeCore-vpn.dnp.dappnode.eth
+  privileged: true
+  restart: always
+  volumes:
+  - '/var/run/docker.sock:/var/run/docker.sock'
+  - '/etc/hostname:/etc/vpnname:ro'
+  - '/usr/src/dappnode/config:/usr/src/app/config:ro'
+  - '/lib/modules:/lib/modules:ro'
+  - 'vpndnpdappnodeeth_data:/usr/src/app/secrets'
+  ports:
+  - '4500:4500/udp'
+  - '500:500/udp'
+  dns: 172.33.1.2
+  networks:
+  network:
+  ipv4_address: 172.33.1.4