浏览代码

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
     new_username="$1"
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
 function generate_stunnel_keys {
469
 function generate_stunnel_keys {
458
     openssl req -x509 -nodes -days 3650 -sha256 \
470
     openssl req -x509 -nodes -days 3650 -sha256 \
459
             -subj "/O=$VPN_ORGANISATION/OU=$VPN_UNIT/C=$VPN_COUNTRY_CODE/ST=$VPN_AREA/L=$VPN_LOCATION/CN=$HOSTNAME" \
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
 export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
31
 export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
32
 export TEXTDOMAINDIR="/usr/share/locale"
32
 export TEXTDOMAINDIR="/usr/share/locale"
33
 
33
 
34
+source /usr/local/bin/${PROJECT_NAME}-app-vpn
35
+
34
 # The browser application to use
36
 # The browser application to use
35
 BROWSER=midori
37
 BROWSER=midori
36
 BROWSER_OPTIONS='-p'
38
 BROWSER_OPTIONS='-p'
616
     configure_toxcore
618
     configure_toxcore
617
     create_tox_user
619
     create_tox_user
618
     #setup_tahoelafs
620
     #setup_tahoelafs
621
+    mesh_setup_vpn
619
     setup_ipfs
622
     setup_ipfs
620
     mesh_amnesic
623
     mesh_amnesic
621
     make_root_read_only
624
     make_root_read_only