Merge branch 'master' of https://github.com/necro-nemesis/Lokiap-webgui

installers/common.sh

@@ -234,7 +234,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"
 }