dot

packages and services management
Log | Files | Refs | README

commit 5ad605870044fcaab187382f356d3b9eb20d0d32
parent b1fed13fa8eee39ce3a4185639bea1e971ee0405
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 24 Nov 2018 23:19:58 +0100

s6/curve-vpn-{client,server}: merge them

Diffstat:
As6/curvevpn/client/env/EXT | 1+
As6/curvevpn/client/env/IP | 1+
As6/curvevpn/client/env/NAME | 1+
As6/curvevpn/client/env/PORT | 1+
As6/curvevpn/client/env/PUBKEY | 1+
As6/curvevpn/client/env/ROOT | 1+
As6/curvevpn/client/env/SERVER | 2++
As6/curvevpn/client/run | 10++++++++++
As6/curvevpn/client/type | 1+
As6/curvevpn/server/env/BIND | 1+
As6/curvevpn/server/run | 14++++++++++++++
As6/curvevpn/x/data/Makefile | 7+++++++
As6/curvevpn/x/data/data | 13+++++++++++++
As6/curvevpn/x/env/EXT | 1+
As6/curvevpn/x/env/NAME | 1+
As6/curvevpn/x/env/PORT | 1+
As6/curvevpn/x/env/ROOT | 1+
As6/curvevpn/x/setup | 2++
As6/curvevpn/x/type | 1+
19 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/s6/curvevpn/client/env/EXT b/s6/curvevpn/client/env/EXT @@ -0,0 +1 @@ +00000000000000000000000000000000 diff --git a/s6/curvevpn/client/env/IP b/s6/curvevpn/client/env/IP @@ -0,0 +1 @@ +127.0.0.1 diff --git a/s6/curvevpn/client/env/NAME b/s6/curvevpn/client/env/NAME @@ -0,0 +1 @@ +vpn.josuah.net diff --git a/s6/curvevpn/client/env/PORT b/s6/curvevpn/client/env/PORT @@ -0,0 +1 @@ +1665 diff --git a/s6/curvevpn/client/env/PUBKEY b/s6/curvevpn/client/env/PUBKEY @@ -0,0 +1 @@ +0000000000000000000000000000000000000000000000000000000000000000 diff --git a/s6/curvevpn/client/env/ROOT b/s6/curvevpn/client/env/ROOT @@ -0,0 +1 @@ +. diff --git a/s6/curvevpn/client/env/SERVER b/s6/curvevpn/client/env/SERVER @@ -0,0 +1 @@ +IP+ \ No newline at end of file diff --git a/s6/curvevpn/client/run b/s6/curvevpn/client/run @@ -0,0 +1,10 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 s6-envdir env multisubstitute { + importas NAME NAME + importas PUBKEY PUBKEY + importas IP IP + importas PORT PORT + importas EXT EXT +} + +curvevpn-client $NAME $PUBKEY $IP $PORT $EXT curvevpn diff --git a/s6/curvevpn/client/type b/s6/curvevpn/client/type @@ -0,0 +1 @@ +longrun diff --git a/s6/curvevpn/server/env/BIND b/s6/curvevpn/server/env/BIND @@ -0,0 +1 @@ +0.0.0.0 diff --git a/s6/curvevpn/server/run b/s6/curvevpn/server/run @@ -0,0 +1,14 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 s6-envdir env multisubstitute { + importas NAME NAME + importas IP IP + importas PORT PORT + importas BASE BASE + importas EXT EXT +} + +cd $BASE +if { rm -f lock/???????????????????????????????????????????????????????????????? } +curvevpn-server $NAME data/key $IP $PORT $EXT +curvevpn-message +curvevpn -s ................................................................ diff --git a/s6/curvevpn/x/data/Makefile b/s6/curvevpn/x/data/Makefile @@ -0,0 +1,7 @@ +all: data.cdb key + +data.cdb: data + curvevpn-data + +key: + curvevpn-makekey key diff --git a/s6/curvevpn/x/data/data b/s6/curvevpn/x/data/data @@ -0,0 +1,13 @@ +# -- EXAMPLE ------------------------------------------------------------------------------------------------------------------ +# #defaut routes +# r::192.168.0.0:255.255.0.0 +# r::10.2.0.0:255.255.0.0 +# r::172.16.85.0:255.255.255.0 +# +# #IP address for the first user with public key 84fb6a942b1bcddff2cfd231d012d5d586b710ff180b6841da721eea5ee4004e +# i:84fb6a942b1bcddff2cfd231d012d5d586b710ff180b6841da721eea5ee4004e:172.16.85.3:172.16.85.4 +# +# #IP address for the second user with public key 68585b65041498f7b9f300ef890169cbc4b55927e9d15f9b3651109f338bf35e + extra route +# i:68585b65041498f7b9f300ef890169cbc4b55927e9d15f9b3651109f338bf35e:172.16.85.5:172.16.85.6 +# r:68585b65041498f7b9f300ef890169cbc4b55927e9d15f9b3651109f338bf35e:10.0.0.0:255.255.0.0 +# -- EXAMPLE ------------------------------------------------------------------------------------------------------------------ diff --git a/s6/curvevpn/x/env/EXT b/s6/curvevpn/x/env/EXT @@ -0,0 +1 @@ +00000000000000000000000000000000 diff --git a/s6/curvevpn/x/env/NAME b/s6/curvevpn/x/env/NAME @@ -0,0 +1 @@ +vpn.josuah.net diff --git a/s6/curvevpn/x/env/PORT b/s6/curvevpn/x/env/PORT @@ -0,0 +1 @@ +1665 diff --git a/s6/curvevpn/x/env/ROOT b/s6/curvevpn/x/env/ROOT @@ -0,0 +1 @@ +data diff --git a/s6/curvevpn/x/setup b/s6/curvevpn/x/setup @@ -0,0 +1,2 @@ +#!/usr/bin/env execline +curvevpn-makekey key diff --git a/s6/curvevpn/x/type b/s6/curvevpn/x/type @@ -0,0 +1 @@ +longrun