浏览代码

Generate vpn keys on mesh

Bob Mottram 7 年前
父节点
当前提交
5ee100c67d
共有 2 个文件被更改,包括 15 次插入0 次删除
  1. 12
    0
      src/freedombone-app-vpn
  2. 3
    0
      src/freedombone-image-mesh

+ 12
- 0
src/freedombone-app-vpn 查看文件

@@ -454,6 +454,18 @@ function remove_user_vpn {
454 454
     new_username="$1"
455 455
 }
456 456
 
457
+function mesh_setup_vpn {
458
+    vpn_generate_keys
459
+
460
+    if [ ${VPN_TLS_PORT} -ne 443 ]; then
461
+        firewall_add VPN-TLS ${VPN_TLS_PORT} tcp
462
+    fi
463
+
464
+    generate_stunnel_keys
465
+
466
+    systemctl restart openvpn
467
+}
468
+
457 469
 function generate_stunnel_keys {
458 470
     openssl req -x509 -nodes -days 3650 -sha256 \
459 471
             -subj "/O=$VPN_ORGANISATION/OU=$VPN_UNIT/C=$VPN_COUNTRY_CODE/ST=$VPN_AREA/L=$VPN_LOCATION/CN=$HOSTNAME" \

+ 3
- 0
src/freedombone-image-mesh 查看文件

@@ -31,6 +31,8 @@ PROJECT_NAME='freedombone'
31 31
 export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
32 32
 export TEXTDOMAINDIR="/usr/share/locale"
33 33
 
34
+source /usr/local/bin/${PROJECT_NAME}-app-vpn
35
+
34 36
 # The browser application to use
35 37
 BROWSER=midori
36 38
 BROWSER_OPTIONS='-p'
@@ -616,6 +618,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
616 618
     configure_toxcore
617 619
     create_tox_user
618 620
     #setup_tahoelafs
621
+    mesh_setup_vpn
619 622
     setup_ipfs
620 623
     mesh_amnesic
621 624
     make_root_read_only