Browse Source

Merge branch 'master' into update-scripts-to-the-new-standard

master
Alexandre Aubin 3 years ago
committed by GitHub
parent
commit
b858a19517
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      conf/ynh-hotspot
  2. 8
      scripts/install

4
conf/ynh-hotspot

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

8
scripts/install

@ -265,6 +265,10 @@ find ${final_path}/ -type d -exec chmod +x {} \;
## hostapd
ynh_replace_string "^DAEMON_CONF=$" "&/etc/hostapd/hostapd.conf" /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
# Fix sources
ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php"
@ -290,6 +294,7 @@ ynh_add_systemd_config $service_name
# and the ynh-hotspot service handles them.
systemctl disable hostapd
systemctl stop hostapd
systemctl unmask hostapd # On some system e.g. RPi, for some reason hostapd is masked after install ...
#=================================================
# RELOAD NGINX AND PHP-FPM
@ -301,8 +306,7 @@ systemctl reload nginx
# Remove IPv6 address set if there is a VPN installed
if [[ $ip6_addr != none ]]; then
ip -6 address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"
if [[ "$?" -eq 0 ]]; then
if ip -6 address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"; then
ip address delete "${ip6_addr}/128" dev tun0 &> /dev/null
fi
fi

Loading…
Cancel
Save