WEBLIB.RE/vpnclient_ynh
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

* Remove default value vpn.ldn-fai.net

Browse Source 
* Update loadcube.sh help
* Allow incoming TCP/443 connections on the wired_interface
This commit is contained in:
Julien Vaubourg
2015-10-08 20:19:35 +02:00
parent 31a0ec42c0
commit 832571f8f0
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/hook_post-iptable-rules
View File

@@ -12,6 +12,7 @@ sudo ip6tables -N vpnclient_fwd
sudo ip6tables -A vpnclient_in -p icmpv6 -j ACCEPT
sudo ip6tables -A vpnclient_in -s fd00::/8,fe80::/10 -j ACCEPT
sudo ip6tables -A vpnclient_in -p tcp --dport 22 -j ACCEPT
sudo ip6tables -A vpnclient_in -p tcp --dport 443 -j ACCEPT
sudo ip6tables -A vpnclient_in -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
sudo ip6tables -A vpnclient_in -j DROP
@@ -44,6 +45,7 @@ sudo iptables -N vpnclient_fwd
sudo iptables -A vpnclient_in -p icmp -j ACCEPT
sudo iptables -A vpnclient_in -s 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16 -j ACCEPT
sudo iptables -A vpnclient_in -p tcp --dport 22 -j ACCEPT
sudo iptables -A vpnclient_in -p tcp --dport 443 -j ACCEPT
sudo iptables -A vpnclient_in -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
sudo iptables -A vpnclient_in -j DROP

4
conf/ynh-vpnclient
View File

@@ -247,10 +247,10 @@ if [ "$1" != restart ]; then
new_ip6_gw=$(ip -6 route | grep default\ via | awk '{ print $3 }')
new_wired_device=$(ip route | awk '/default via/ { print $NF; }')
new_server_ip6=$(host "${ynh_server_name}" | awk '/IPv6/ { print $NF; }')
new_server_ip6=$(host "${ynh_server_name}" 2> /dev/null | awk '/IPv6/ { print $NF; }')
if [ -z "${new_server_ip6}" ]; then
new_server_ip6=$(host "${ynh_server_name}" 80.67.188.188 | awk '/IPv6/ { print $NF; }')
new_server_ip6=$(host "${ynh_server_name}" 80.67.188.188 2> /dev/null | awk '/IPv6/ { print $NF; }')
fi
echo "OK"

10
conf/ynh-vpnclient-loadcubefile.sh
View File

@@ -36,19 +36,15 @@ while getopts "u:p:c:h" opt; do
fi
;;
h)
echo "-u SSO username (user with permissions on VPN Client)"
echo "-p SSO password"
echo "-u YunoHost username (user with permissions on VPN Client)"
echo "-p User password"
echo "-c Dot cube file path"
echo "-h This help"
exit 0
;;
\?)
echo "[ERR] Invalid option: -$OPTARG (-h for help)" >&2
exit 1
;;
:)
echo "[ERR] Option -$OPTARG requires an argument" >&2
echo "[ERR] Invalid option (-h for help)" >&2
exit 1
;;
esac

2
scripts/install
View File

@@ -51,7 +51,7 @@ if ! $upgrade; then
# Save arguments
sudo yunohost app setting vpnclient service_enabled -v 0
sudo yunohost app setting vpnclient server_name -v access.ldn-fai.net
sudo yunohost app setting vpnclient server_name -v none
sudo yunohost app setting vpnclient server_port -v 1194
sudo yunohost app setting vpnclient server_proto -v udp
sudo yunohost app setting vpnclient ip6_addr -v none