Merge pull request #42 from necro-nemesis/master

align backup with master

README.md

@@ -32,13 +32,15 @@ LabyrinthAP comes with it's own auto-installation scripts to set up Lokinet and
  - [License](#license)
 
 ## Prerequisites
-Start with a clean install of [Armbian](https://www.armbian.com/) or [Raspberry Pi OS](https://www.raspberrypi.org/downloads/raspberry-pi-os/) (currently Buster and Stretch are verified as working). Lite versions are recommended as all additional dependencies are added by the installer. If using Raspberry Pi OS you will need to elevate to root with ```sudo su``` before running the LabyrinthAP installer script. This additional step is not required when using Armbian.
+Start with a clean install of [Armbian](https://www.armbian.com/) or [Raspberry Pi OS](https://www.raspberrypi.org/downloads/raspberry-pi-os/) When using Armbian currently Bullseye and Buster are verified as working on OrangePi's and Armbian Focal CLI for Raspberry Pi. When using Raspberry Pi OS Buster lite is recommended. Lite versions are also recommended as all additional dependencies are added by the installer. If using Raspberry Pi OS you will need to elevate to root with ```sudo su``` before running the LabyrinthAP installer script. This additional step is not required when using Armbian.
 
-For Orange Pi R1 use Armbian Buster found here: https://www.armbian.com/orange-pi-r1/. Recommend using "minimal" which is available for direct download at the bottom of the page or much faster download by .torrent also linked there.
+For Raspberry Pi 4 use Armbian Focal found here: https://www.armbian.com/rpi4b/. Recommend using "cli" mininal version which is available for direct download at the bottom of the page or much faster download by .torrent also linked there.
+
+For Orange Pi R1 use Armbian Bullseye found here: https://www.armbian.com/orange-pi-r1/. Recommend using "minimal" which is available for direct download at the bottom of the page or much faster download by .torrent also linked there.
 
 Specific code has been incorporated to take advantage of the OrangePi R1's second ethernet interface. The AP will provide access via ethernet in addition to wifi when using this board.
 
-For OrangePi Zero use Armbian Buster found here": https://www.armbian.com/orange-pi-zero/
+For OrangePi Zero use Armbian Bullseye found here": https://www.armbian.com/orange-pi-zero/
 
 Note:
 
@@ -90,7 +92,7 @@ The installer will complete the installation steps for you. You will be occasion
 After the reboot at the end of the installation the wireless network will be
 configured as an access point as follows:
 
-* AP GUI address: loki.ap.local or use IP address: 10.3.141.1
+* AP GUI address: http://loki.ap.local or use IP address: 10.3.141.1
   * Username: `admin`
   * Password: `secret`
 * DHCP range: 10.3.141.1 to 10.3.141.24

installers/common.sh

@@ -5,24 +5,25 @@ version=`sed 's/\..*//' /etc/debian_version`
 
 # Determine version, set default home location for lighttpd and
 # php package to install
-if [ $version -eq 10 ]; then
-    version_msg="10.0 (Buster)"
+if [ $version -eq 11 ]; then
+    version_msg="11.0 (Bullseye)"
     sudo apt update --allow-releaseinfo-change
+    php_package="php7.4-cgi"
+elif [ $version -eq 10 ]; then
+    version_msg="10.0 (Buster)"
     php_package="php7.3-cgi"
 elif [ $version -eq 9 ]; then
     version_msg="9.0 (Stretch)"
     php_package="php7.0-cgi"
-elif [ $version -eq 8 ]; then
-    version_msg="8.0 (Jessie)"
-    php_package="php5.6-cgi"
 else
-    version_msg="Earlier than 8.0 (Wheezy)"
-    webroot_dir="/var/www"
-    php_package="php5.6-cgi"
+    version_msg="Unmatched version use php7.4"
+    php_package="php7.4-cgi"
 fi
 
 phpcgiconf=""
-if [ "$php_package" = "php7.3-cgi" ]; then
+if [ "$php_package" = "php7.4-cgi" ]; then
+    phpcgiconf="/etc/php/7.4/cgi/php.ini"
+elif [ "$php_package" = "php7.3-cgi" ]; then
     phpcgiconf="/etc/php/7.3/cgi/php.ini"
 elif [ "$php_package" = "php7.0-cgi" ]; then
     phpcgiconf="/etc/php/7.0/cgi/php.ini"
@@ -229,7 +230,7 @@ function move_config_file() {
 
 function network_tables() {
     install_log "Selecting iptables or nftable rules"
-    if [ $version -lt 11 ]; then
+    if [ $version -lt 12 ]; then
     install_log "Use iptables"
     sudo apt-get -y install iptables
     tablerouteA='iptables -t nat -A POSTROUTING -s 10.3.141.0\/24 -o lokitun0 -j MASQUERADE #RASPAP'

installers/raspbian.sh

@@ -11,8 +11,10 @@ function install_dependencies() {
     install_log "Installing required packages"
     sudo apt-get -y install curl
     echo "Install public key used to sign the lokinet binaries."
-    curl -s https://deb.imaginary.stream/public.gpg | sudo apt-key add -
-    echo "deb https://deb.imaginary.stream $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/imaginary.stream.list
+    curl -so /etc/apt/trusted.gpg.d/oxen.gpg https://deb.oxen.io/pub.gpg
+    echo "deb https://deb.oxen.io $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/oxen.list
+    #curl -s https://deb.imaginary.stream/public.gpg | sudo apt-key add -
+    #echo "deb https://deb.imaginary.stream $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/imaginary.stream.list
     sudo apt-get update
     sudo yes | apt-get install whois lighttpd $php_package git resolvconf hostapd dnsmasq vnstat libqmi-utils udhcpc lokinet || install_error "Unable to install dependencies"
 }