From ae571ac888c1ac618cac45bec2e51f63a220bbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Antu=C3=B1a=20D=C3=ADez?= Date: Mon, 4 Jun 2018 00:51:24 +0200 Subject: [PATCH] Fixed volumen problem Remove some console logs Hardcoded the ENV vars --- build/Dockerfile | 2 ++ build/src/getAdminCredentials.js | 4 ++-- dappnode_package.json | 21 +++++++++++---------- docker-compose-vpn.yml | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index c6a37797..44b08460 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -75,6 +75,8 @@ ENV VPN_IP_FILE_PATH /usr/src/app/secrets/server-ip ENV VPN_PSK_FILE_PATH /usr/src/app/secrets/server-psk ENV VPN_NAME_FILE_PATH /usr/src/app/secrets/vpnname ENV VPN_ADMIN_PASS_FILE_PATH /usr/src/app/secrets/admin-pass +ENV VPN_DNS_SRV1 172.33.1.2 +ENV VPN_DNS_SRV2 8.8.8.8 # location of the OTP parsing tool ENV DAPPNODE_OTP_URL https://dappnode.github.io/DAppNode_OTP/ diff --git a/build/src/getAdminCredentials.js b/build/src/getAdminCredentials.js index 55853482..a6df79d1 100644 --- a/build/src/getAdminCredentials.js +++ b/build/src/getAdminCredentials.js @@ -20,9 +20,9 @@ start() async function start () { - console.log('Waiting for credentials files to exist') + //console.log('Waiting for credentials files to exist') await fetchVPNparameters() - console.log('VPN credentials fetched, VPN_IP: ' + VPN_IP + ' VPN_PSK: ' + VPN_PSK) + //console.log('VPN credentials fetched, VPN_IP: ' + VPN_IP + ' VPN_PSK: ' + VPN_PSK) logAdminCredentials(VPN_IP, VPN_PSK) diff --git a/dappnode_package.json b/dappnode_package.json index e3cf0c20..cea15740 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,25 +1,22 @@ { "name": "vpn.dnp.dappnode.eth", - "version": "0.1.0", + "version": "0.1.1", "description": "Dappnode package responsible for providing the VPN (L2TP/IPSec) connection", "avatar": "/ipfs/QmWwMb3XhuCH6JnCF6m6EQzA4mW9pHHtg7rqAfhDr2ofi8", "type": "dncore", "image": { - "path": "vpn.dnp.dappnode.eth_0.1.0.tar.xz", - "hash": "/ipfs/QmXvWFs6Re4Bp42gYa4whQE9yKSJbi3g9PETaTUnypQKm5", - "size": 31516488, + "path": "vpn.dnp.dappnode.eth_0.1.1.tar.xz", + "hash": "/ipfs/QmVDxpEtRYyhhf5uKdgJrqT7vNNRp3W8wZBHsWLnoKr34h", + "size": 31504548, "volumes": [ "/etc/hostname:/etc/vpnname:ro", - "/lib/modules:/lib/modules:ro" + "/lib/modules:/lib/modules:ro", + "vpndnpdappnodeeth_data:/usr/src/app/secrets" ], "ports": [ "4500:4500/udp", "500:500/udp" ], - "environment": [ - "VPN_DNS_SRV1=172.33.1.2", - "VPN_DNS_SRV2=8.8.8.8" - ], "privileged": "true", "restart": "always", "subnet": "172.33.0.0/16", @@ -36,7 +33,11 @@ "IPSec", "L2TP" ], - "homepage": "https://github.com/dappnode/DNP_VPN#readme", + "homepage": { + "adminui": "http://my.vpn.dnp.dappnode.eth", + "userui": "http://my.vpn.dnp.dappnode.eth", + "homepage": "https://github.com/dappnode/DNP_BIND#readme" + }, "repository": { "type": "git", "url": "https://github.com/dappnode/DNP_VPN" diff --git a/docker-compose-vpn.yml b/docker-compose-vpn.yml index 46c417c6..586223fe 100644 --- a/docker-compose-vpn.yml +++ b/docker-compose-vpn.yml @@ -7,22 +7,23 @@ networks: config: - subnet: 172.33.0.0/16 +volumes: + vpndnpdappnodeeth_data: {} + services: vpn.dnp.dappnode.eth: build: ./build - image: vpn.dnp.dappnode.eth:0.1.0 + image: vpn.dnp.dappnode.eth:0.1.1 container_name: DAppNodeCore-vpn.dnp.dappnode.eth privileged: true restart: always volumes: - /etc/hostname:/etc/vpnname:ro - /lib/modules:/lib/modules:ro + - vpndnpdappnodeeth_data:/usr/src/app/secrets ports: - 4500:4500/udp - 500:500/udp - environment: - - VPN_DNS_SRV1=172.33.1.2 - - VPN_DNS_SRV2=8.8.8.8 dns: 172.33.1.2 networks: network: