|
@@ -36,6 +36,7 @@ IN_DEFAULT_INSTALL=0
|
36
|
36
|
SHOW_ON_ABOUT=0
|
37
|
37
|
|
38
|
38
|
OPENVPN_SERVER_NAME="${PROJECT_NAME}-vpn"
|
|
39
|
+OPENVPN_KEY_FILENAME='vpn.ovpn'
|
39
|
40
|
|
40
|
41
|
vpn_variables=(MY_EMAIL_ADDRESS
|
41
|
42
|
LOCAL_NETWORK_STATIC_IP_ADDRESS
|
|
@@ -85,6 +86,14 @@ function remove_vpn {
|
85
|
86
|
fi
|
86
|
87
|
firewall_deny_forwarding
|
87
|
88
|
remove_completion_param install_vpn
|
|
89
|
+
|
|
90
|
+ # remove any client keys
|
|
91
|
+ for d in /home/*/ ; do
|
|
92
|
+ USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
|
|
93
|
+ if [ -f /home/$USERNAME/$OPENVPN_KEY_FILENAME ]; then
|
|
94
|
+ shred -zu /home/$USERNAME/$OPENVPN_KEY_FILENAME
|
|
95
|
+ fi
|
|
96
|
+ done
|
88
|
97
|
}
|
89
|
98
|
|
90
|
99
|
function create_user_vpn_key {
|
|
@@ -112,7 +121,7 @@ y
|
112
|
121
|
exit 682523
|
113
|
122
|
fi
|
114
|
123
|
|
115
|
|
- user_vpn_cert_file=/home/$username/vpn.ovpn
|
|
124
|
+ user_vpn_cert_file=/home/$username/$OPENVPN_KEY_FILENAME
|
116
|
125
|
|
117
|
126
|
cp /usr/share/doc/openvpn/examples/sample-config-files/client.conf $user_vpn_cert_file
|
118
|
127
|
sed -i "s|remote .*|remote $DEFAULT_DOMAIN_NAME 1194|g" $user_vpn_cert_file
|