about summary refs log tree commit diff
diff options
context:
space:
mode:
authormaride <maride@darknebu.la>2018-08-24 18:21:51 +0200
committermaride <maride@darknebu.la>2018-08-24 18:21:51 +0200
commit9c167802cc9b9a72fb6b3d773e9ce10edcf434c4 (patch)
treef57bd501af6d8bbf2c3865e982bdb887ef57880f
parent0a40e8487cb9e1ce4c21fbd6ba84ea5044a0db45 (diff)
Fix announced IP space, fix routes, fix client cert generation
-rw-r--r--chainloader.sh3
-rw-r--r--client.conf3
-rw-r--r--server.conf4
3 files changed, 6 insertions, 4 deletions
diff --git a/chainloader.sh b/chainloader.sh
index 98558b2..d9ec139 100644
--- a/chainloader.sh
+++ b/chainloader.sh
@@ -4,7 +4,8 @@
 openvpn --genkey --secret /prod/persist/static.key
 
 # Generate client.conf
-cat /prod/client.conf > /tmp/client.conf
+echo "remote $remoteAddress $remotePort" > /tmp/client.conf
+cat /prod/client.conf >> /tmp/client.conf
 echo "<secret>" >> /tmp/client.conf
 cat /prod/persist/static.key >> /tmp/client.conf
 echo "</secret>" >> /tmp/client.conf
diff --git a/client.conf b/client.conf
index 7b1d2b4..7c529f5 100644
--- a/client.conf
+++ b/client.conf
@@ -1,6 +1,7 @@
 # Network related
 dev tun
-ifconfig 10.13.37.253 10.13.37.254
+ifconfig 10.13.42.2 10.13.42.1
+route 10.13.37.0/24
 
 # Connection related
 comp-lzo
diff --git a/server.conf b/server.conf
index 6d3a0e4..2acb7cd 100644
--- a/server.conf
+++ b/server.conf
@@ -1,7 +1,7 @@
 # Network related
 dev tun
-ifconfig 10.13.37.254 10.13.37.253
-route 10.13.37.0 255.255.255.0
+ifconfig 10.13.42.1 10.13.42.2
+push "route 10.13.37.0 255.255.255.0"
 
 # Connection related
 comp-lzo