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

Merge pull request #56 from labriqueinternet/fix-if

Browse Source 
Misc fixes (for RPi3 but not only)
This commit is contained in:
Alexandre Aubin
2019-03-21 02:16:22 +01:00
committed by GitHub
parent 74ad064c7f e51559d856
commit 157a5b8eb6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/ynh-hotspot
View File

@@ -320,7 +320,7 @@ case "$1" in
start) start)
if is_running; then if is_running; then
echo "Already started" echo "Already started"
elif [ "${ynh_service_enabled}" -eq 0 ]; then elif [ "${ynh_service_enabled}" != "enabled" ]; then
echo "Disabled service" echo "Disabled service"
else else
echo "[hotspot] Starting..." echo "[hotspot] Starting..."
@@ -469,7 +469,7 @@ case "$1" in
status) status)
exitcode=0 exitcode=0
if [ "${ynh_service_enabled}" -eq 0 ]; then if [ "${ynh_service_enabled}" != "enabled" ]; then
echo "[ERR] Hotspot Service disabled" echo "[ERR] Hotspot Service disabled"
exitcode=1 exitcode=1
fi fi

8
scripts/install
View File

@@ -259,6 +259,10 @@ find /var/www/wifiadmin/ -type d -exec chmod +x {} \;
## hostapd ## hostapd
sed 's|^DAEMON_CONF=$|&/etc/hostapd/hostapd.conf|' -i /etc/init.d/hostapd sed 's|^DAEMON_CONF=$|&/etc/hostapd/hostapd.conf|' -i /etc/init.d/hostapd
# We also need to put this in /etc/default/hostapd because on some setup
# like RPi, the version of hostapd is different and /etc/init.d/hostapd
# isnt used ... instead the service is "pure systemd" ...
echo "DAEMON_CONF=/etc/hostapd/hostapd.conf" > /etc/default/hostapd
## nginx ## nginx
sed "s|<TPL:NGINX_LOCATION>|${path_url}|g" -i "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf" sed "s|<TPL:NGINX_LOCATION>|${path_url}|g" -i "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf"
@@ -287,14 +291,14 @@ yunohost firewall allow --no-upnp UDP 67
# and the ynh-hotspot service handles them. # and the ynh-hotspot service handles them.
systemctl disable hostapd systemctl disable hostapd
systemctl stop hostapd systemctl stop hostapd
systemctl unmask hostapd # On some system e.g. RPi, for some reason hostapd is masked after install ...
systemctl enable php5-fpm systemctl enable php5-fpm
systemctl restart php5-fpm systemctl restart php5-fpm
systemctl reload nginx systemctl reload nginx
# Remove IPv6 address set if there is a VPN installed # Remove IPv6 address set if there is a VPN installed
if [[ $ip6_addr != none ]]; then if [[ $ip6_addr != none ]]; then
ip -6 address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/" if ip -6 address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"; then
if [[ "$?" -eq 0 ]]; then
ip address delete "${ip6_addr}/128" dev tun0 &> /dev/null ip address delete "${ip6_addr}/128" dev tun0 &> /dev/null
fi fi
fi fi