From 5ee100c67dfd62273331f2a99e99695783fa28d0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 30 Sep 2017 14:01:05 +0100
Subject: [PATCH] Generate vpn keys on mesh
---
src/freedombone-app-vpn | 12 ++++++++++++
src/freedombone-image-mesh | 3 +++
2 files changed, 15 insertions(+)
diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn
index 86e6da67b..8ef0e4e8c 100755
--- a/src/freedombone-app-vpn
+++ b/src/freedombone-app-vpn
@@ -454,6 +454,18 @@ function remove_user_vpn {
new_username="$1"
}
+function mesh_setup_vpn {
+ vpn_generate_keys
+
+ if [ ${VPN_TLS_PORT} -ne 443 ]; then
+ firewall_add VPN-TLS ${VPN_TLS_PORT} tcp
+ fi
+
+ generate_stunnel_keys
+
+ systemctl restart openvpn
+}
+
function generate_stunnel_keys {
openssl req -x509 -nodes -days 3650 -sha256 \
-subj "/O=$VPN_ORGANISATION/OU=$VPN_UNIT/C=$VPN_COUNTRY_CODE/ST=$VPN_AREA/L=$VPN_LOCATION/CN=$HOSTNAME" \
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index b054b4424..ce14765b8 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -31,6 +31,8 @@ PROJECT_NAME='freedombone'
export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
export TEXTDOMAINDIR="/usr/share/locale"
+source /usr/local/bin/${PROJECT_NAME}-app-vpn
+
# The browser application to use
BROWSER=midori
BROWSER_OPTIONS='-p'
@@ -616,6 +618,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
configure_toxcore
create_tox_user
#setup_tahoelafs
+ mesh_setup_vpn
setup_ipfs
mesh_amnesic
make_root_read_only
--
GitLab