Merge pull request #418 from iiab/master

Sync from iiab:master

roles/network/templates/hostapd/50-hostapd

@@ -16,6 +16,8 @@ if [ "$interface" = "wlan0" ]; then
             echo "frequency is $result for carrier"
             if [ $result -lt 13 ]; then
                 FREQ2=$result
+            else
+                syslog info "50-iiab channel $FREQ2 is 5Ghz NOT CHANGING HOSTAPD"
             fi
         done
         echo "Using $FREQ2 for carrier"
@@ -26,6 +28,8 @@ if [ "$interface" = "wlan0" ]; then
             echo "Editing Hostapd for channel $FREQ2"
             cp /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
             sed -i -e "s/^channel.*/channel=$FREQ /" /etc/hostapd/hostapd.conf
+            echo "THIS MACHINE SHOULD BE REBOOTED"
+            syslog info "THIS MACHINE SHOULD BE REBOOTED"
 #            systemctl restart hostapd
         fi
     fi

roles/network/templates/hostapd/test-wifi

@@ -53,6 +53,8 @@ for result in $FREQ; do
     if [ $result -lt 2485 ] && [ $result -gt 2407 ]; then
         FREQ2=$result
         break
+    else
+        echo "channel $result is 5Ghz - ignoring"
     fi
 done
 echo "Using $FREQ2 for $SSID"

vars/default_vars.yml

@@ -7,6 +7,10 @@
 # IIAB does NOT currently support uninstalling apps!  So: if any IIAB app is
 # installed with 'APP_XYZ_install: True' below, do NOT later change that.
 
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
+
 
 # IIAB (PRE-)release version number, for {{ iiab_env_file }}
 iiab_base_ver: 7.2
@@ -86,9 +90,9 @@ iiab_home_url: /home
 # Internal Wi-Fi Access Point
 # Values are used if there is an internal Wi-Fi adapter and hostapd is enabled.
 #
-# WARNING: If you connect your IIAB's internal WiFi to the Internet over 5 GHz,
-# you'll end up preventing older laptops/phones/tablets (which require 2.4 GHz)
-# from connecting to your IIAB's internal hotspot!  BAD IDEA (:
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
 #
 # Raspberry Pi OS requires WiFi country -- SET THIS IN /etc/iiab/local_vars.yml
 host_country_code: US

vars/local_vars_big.yml

@@ -7,6 +7,10 @@
 # IIAB does NOT currently support uninstalling apps!  So: if any IIAB app is
 # installed with 'APP_XYZ_install: True' below, do NOT later change that.
 
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
+
 
 # Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
 download_timeout: 200
@@ -39,9 +43,9 @@ iiab_domain: lan
 iiab_home_url: /home
 # You might also want to set captiveportal_splash_page (below!)
 
-# WARNING: If you connect your IIAB's internal WiFi to the Internet over 5 GHz,
-# you'll end up preventing older laptops/phones/tablets (which require 2.4 GHz)
-# from connecting to your IIAB's internal hotspot!  BAD IDEA (:
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
 #
 # Raspberry Pi OS requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US

vars/local_vars_medium.yml

@@ -7,6 +7,10 @@
 # IIAB does NOT currently support uninstalling apps!  So: if any IIAB app is
 # installed with 'APP_XYZ_install: True' below, do NOT later change that.
 
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
+
 
 # Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
 download_timeout: 200
@@ -39,9 +43,9 @@ iiab_domain: lan
 iiab_home_url: /home
 # You might also want to set captiveportal_splash_page (below!)
 
-# WARNING: If you connect your IIAB's internal WiFi to the Internet over 5 GHz,
-# you'll end up preventing older laptops/phones/tablets (which require 2.4 GHz)
-# from connecting to your IIAB's internal hotspot!  BAD IDEA (:
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
 #
 # Raspberry Pi OS requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US

vars/local_vars_min.yml

@@ -7,6 +7,10 @@
 # IIAB does NOT currently support uninstalling apps!  So: if any IIAB app is
 # installed with 'APP_XYZ_install: True' below, do NOT later change that.
 
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
+
 
 # Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
 download_timeout: 200
@@ -39,9 +43,9 @@ iiab_domain: lan
 iiab_home_url: /home
 # You might also want to set captiveportal_splash_page (below!)
 
-# WARNING: If you connect your IIAB's internal WiFi to the Internet over 5 GHz,
-# you'll end up preventing older laptops/phones/tablets (which require 2.4 GHz)
-# from connecting to your IIAB's internal hotspot!  BAD IDEA (:
+# WARNING: IF YOU CONNECT YOUR IIAB'S INTERNAL WIFI TO THE INTERNET OVER 5 GHz,
+# YOU'LL PREVENT OLDER LAPTOPS/PHONES/TABLETS (WHICH REQUIRE 2.4 GHz) FROM
+# CONNECTING TO YOUR IIAB'S INTERNAL HOTSPOT.  See "wifi_up_down: True" below.
 #
 # Raspberry Pi OS requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US