YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Fix an nginx conf typo

Browse source
This commit is contained in:
Julien VAUBOURG 2014-12-28 23:27:39 +01:00
parent 87450f373e
commit 266a68bcea
3 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
conf/init_ynh-hotspot
View file

@ -141,6 +141,7 @@ set_dhcpd() {
sed "s|<TPL:WIFI_DEVICE>|${ynh_wifi_device}|g" -i /etc/dnsmasq.d/dhcpdv4.conf sed "s|<TPL:WIFI_DEVICE>|${ynh_wifi_device}|g" -i /etc/dnsmasq.d/dhcpdv4.conf
sed "s|<TPL:IP4_NAT_PREFIX>|${ynh_ip4_nat_prefix}|g" -i /etc/dnsmasq.d/dhcpdv4.conf sed "s|<TPL:IP4_NAT_PREFIX>|${ynh_ip4_nat_prefix}|g" -i /etc/dnsmasq.d/dhcpdv4.conf
service bind9 stop &> /dev/null
service dnsmasq restart service dnsmasq restart
} }
@ -235,55 +236,59 @@ moulinette_set() {
fi fi
} }
# Restart php5-fpm at the first start (it needs to be restarted after the slapd start) if [ "$1" != restart ]; then
if [ ! -e /tmp/.ynh-hotspot-boot ]; then
touch /tmp/.ynh-hotspot-boot
service php5-fpm restart
fi
# Variables # Restart php5-fpm at the first start (it needs to be restarted after the slapd start)
if [ ! -e /tmp/.ynh-hotspot-boot ]; then
touch /tmp/.ynh-hotspot-boot
service php5-fpm restart
fi
echo -n "Retrieving Yunohost settings... " # Variables
ynh_wifi_device=$(moulinette_get wifi_device) echo -n "Retrieving Yunohost settings... "
ynh_wifi_ssid=$(moulinette_get wifi_ssid)
ynh_wifi_passphrase=$(moulinette_get wifi_passphrase)
ynh_wifi_channel=$(moulinette_get wifi_channel)
ynh_wifi_n=$(moulinette_get wifi_n)
ynh_ip6_addr=$(moulinette_get ip6_addr)
ynh_ip6_net=$(moulinette_get ip6_net)
ynh_ip6_dns0=$(moulinette_get ip6_dns0)
ynh_ip6_dns1=$(moulinette_get ip6_dns1)
ynh_ip4_dns0=$(moulinette_get ip4_dns0)
ynh_ip4_dns1=$(moulinette_get ip4_dns1)
ynh_ip4_nat_prefix=$(moulinette_get ip4_nat_prefix)
old_internet_device=$(moulinette_get internet_device) ynh_wifi_device=$(moulinette_get wifi_device)
new_internet_device=$(ip route | awk '/default via/ { print $NF; }') ynh_wifi_ssid=$(moulinette_get wifi_ssid)
ynh_wifi_passphrase=$(moulinette_get wifi_passphrase)
ynh_wifi_channel=$(moulinette_get wifi_channel)
ynh_wifi_n=$(moulinette_get wifi_n)
ynh_ip6_addr=$(moulinette_get ip6_addr)
ynh_ip6_net=$(moulinette_get ip6_net)
ynh_ip6_dns0=$(moulinette_get ip6_dns0)
ynh_ip6_dns1=$(moulinette_get ip6_dns1)
ynh_ip4_dns0=$(moulinette_get ip4_dns0)
ynh_ip4_dns1=$(moulinette_get ip4_dns1)
ynh_ip4_nat_prefix=$(moulinette_get ip4_nat_prefix)
# Switch the NAT interface if there is a VPN old_internet_device=$(moulinette_get internet_device)
ip link show dev tun0 &> /dev/null new_internet_device=$(ip route | awk '/default via/ { print $NF; }')
if [ "$?" -eq 0 ]; then
new_internet_device=tun0
fi
echo "OK" # Switch the NAT interface if there is a VPN
ip link show dev tun0 &> /dev/null
if [ "$?" -eq 0 ]; then
new_internet_device=tun0
fi
# Check IPv6 delegated prefix from vpnclient echo "OK"
vpnclient_ip6_net=$(moulinette_vpnclient_get ip6_net)
if [ ! -z "${vpnclient_ip6_addr}" ]; then # Check IPv6 delegated prefix from vpnclient
if [ "${ynh_ip6_net}" == none ]; then vpnclient_ip6_net=$(moulinette_vpnclient_get ip6_net)
ynh_ip6_net=$vpnclient_ip6_net
ynh_ip6_addr=$(moulinette_vpnclient_get ip6_addr)
moulinette_set ip6_net "${ynh_ip6_net}" if [ ! -z "${vpnclient_ip6_addr}" ]; then
moulinette_set ip6_addr "${ynh_ip6_addr}" if [ "${ynh_ip6_net}" == none ]; then
else ynh_ip6_net=$vpnclient_ip6_net
if [ "${ynh_ip6_net}" != "${vpnclient_ip6_net}" ]; then ynh_ip6_addr=$(moulinette_vpnclient_get ip6_addr)
echo "[WARN] The IPv6 delegated prefix is different from the vpnclient one"
moulinette_set ip6_net "${ynh_ip6_net}"
moulinette_set ip6_addr "${ynh_ip6_addr}"
else
if [ "${ynh_ip6_net}" != "${vpnclient_ip6_net}" ]; then
echo "[WARN] The IPv6 delegated prefix is different from the vpnclient one"
fi
fi fi
fi fi
fi fi
# Script # Script

2
conf/nginx_wifiadmin.conf
View file

@ -18,7 +18,7 @@
location <TPL:NGINX_LOCATION> { location <TPL:NGINX_LOCATION> {
alias <TPL:NGINX_REALPATH>; alias <TPL:NGINX_REALPATH>;
if($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }

2
scripts/install
View file

@ -55,7 +55,7 @@ if [ ! $? -eq 0 ]; then
fi fi
# Install packages # Install packages
packages='php5-fpm sipcalc hostapd iptables wireless-tools' packages='php5-fpm sipcalc hostapd iptables wireless-tools dnsmasq'
# Packaged USB Wireless Device firmwares # Packaged USB Wireless Device firmwares
# Based on https://wiki.debian.org/WiFi#USB_Devices # Based on https://wiki.debian.org/WiFi#USB_Devices