Browse Source

Don't use ta.key

Bob Mottram 7 years ago
parent
commit
dea56279e4
1 changed files with 7 additions and 0 deletions
  1. 7
    0
      src/freedombone-app-vpn

+ 7
- 0
src/freedombone-app-vpn View File

190
     sed -i 's|ca ca.crt|;ca ca.crt|g' $user_vpn_cert_file
190
     sed -i 's|ca ca.crt|;ca ca.crt|g' $user_vpn_cert_file
191
     sed -i 's|cert client.crt|;cert client.crt|g' $user_vpn_cert_file
191
     sed -i 's|cert client.crt|;cert client.crt|g' $user_vpn_cert_file
192
     sed -i 's|key client.key|;key client.key|g' $user_vpn_cert_file
192
     sed -i 's|key client.key|;key client.key|g' $user_vpn_cert_file
193
+    sed -i 's|tls-auth ta.key|;tls-auth ta.key|g' $user_vpn_cert_file
193
 
194
 
194
     echo '<ca>' >> $user_vpn_cert_file
195
     echo '<ca>' >> $user_vpn_cert_file
195
     cat /etc/openvpn/ca.crt >> $user_vpn_cert_file
196
     cat /etc/openvpn/ca.crt >> $user_vpn_cert_file
229
         echo $'Example openvpn server config not found'
230
         echo $'Example openvpn server config not found'
230
         exit 783953
231
         exit 783953
231
     fi
232
     fi
233
+
234
+    # server configuration
232
     gunzip -c /usr/share/doc/openvpn/examples/sample-config-files/server.conf.gz > /etc/openvpn/server.conf
235
     gunzip -c /usr/share/doc/openvpn/examples/sample-config-files/server.conf.gz > /etc/openvpn/server.conf
233
     sed -i "s|;push \"redirect-gateway|push \"redirect-gateway|g" /etc/openvpn/server.conf
236
     sed -i "s|;push \"redirect-gateway|push \"redirect-gateway|g" /etc/openvpn/server.conf
234
     sed -i 's|;push "dhcp-option|push "dhcp-option|g' /etc/openvpn/server.conf
237
     sed -i 's|;push "dhcp-option|push "dhcp-option|g' /etc/openvpn/server.conf
235
     sed -i 's|;user nobody|user nobody|g' /etc/openvpn/server.conf
238
     sed -i 's|;user nobody|user nobody|g' /etc/openvpn/server.conf
236
     sed -i 's|;group nogroup|group nogroup|g' /etc/openvpn/server.conf
239
     sed -i 's|;group nogroup|group nogroup|g' /etc/openvpn/server.conf
240
+
237
     echo 1 > /proc/sys/net/ipv4/ip_forward
241
     echo 1 > /proc/sys/net/ipv4/ip_forward
238
     sed -i 's|# net.ipv4.ip_forward|net.ipv4.ip_forward|g' /etc/sysctl.conf
242
     sed -i 's|# net.ipv4.ip_forward|net.ipv4.ip_forward|g' /etc/sysctl.conf
239
     sed -i 's|#net.ipv4.ip_forward|net.ipv4.ip_forward|g' /etc/sysctl.conf
243
     sed -i 's|#net.ipv4.ip_forward|net.ipv4.ip_forward|g' /etc/sysctl.conf
244
         mkdir /etc/openvpn/easy-rsa/keys
248
         mkdir /etc/openvpn/easy-rsa/keys
245
     fi
249
     fi
246
 
250
 
251
+    # keys configuration
247
     sed -i "s|export KEY_COUNTRY.*|export KEY_COUNTRY=\"US\"|g" /etc/openvpn/easy-rsa/vars
252
     sed -i "s|export KEY_COUNTRY.*|export KEY_COUNTRY=\"US\"|g" /etc/openvpn/easy-rsa/vars
248
     sed -i "s|export KEY_PROVINCE.*|export KEY_PROVINCE=\"TX\"|g" /etc/openvpn/easy-rsa/vars
253
     sed -i "s|export KEY_PROVINCE.*|export KEY_PROVINCE=\"TX\"|g" /etc/openvpn/easy-rsa/vars
249
     sed -i "s|export KEY_CITY.*|export KEY_CITY=\"Dallas\"|g" /etc/openvpn/easy-rsa/vars
254
     sed -i "s|export KEY_CITY.*|export KEY_CITY=\"Dallas\"|g" /etc/openvpn/easy-rsa/vars
251
     sed -i "s|export KEY_EMAIL.*|export KEY_EMAIL=\"$MY_EMAIL_ADDRESS\"|g" /etc/openvpn/easy-rsa/vars
256
     sed -i "s|export KEY_EMAIL.*|export KEY_EMAIL=\"$MY_EMAIL_ADDRESS\"|g" /etc/openvpn/easy-rsa/vars
252
     sed -i "s|export KEY_OU=.*|export KEY_OU=\"MoonUnit\"|g" /etc/openvpn/easy-rsa/vars
257
     sed -i "s|export KEY_OU=.*|export KEY_OU=\"MoonUnit\"|g" /etc/openvpn/easy-rsa/vars
253
     sed -i "s|export KEY_NAME.*|export KEY_NAME=\"$OPENVPN_SERVER_NAME\"|g" /etc/openvpn/easy-rsa/vars
258
     sed -i "s|export KEY_NAME.*|export KEY_NAME=\"$OPENVPN_SERVER_NAME\"|g" /etc/openvpn/easy-rsa/vars
259
+
260
+    # generate host keys
254
     if [ ! -f /etc/openvpn/dh2048.pem ]; then
261
     if [ ! -f /etc/openvpn/dh2048.pem ]; then
255
         openssl dhparam -out /etc/openvpn/dh2048.pem 2048
262
         openssl dhparam -out /etc/openvpn/dh2048.pem 2048
256
     fi
263
     fi