From 2beaab7a25765228e796fe596d2144c647cead1a Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 21 Jul 2020 09:24:45 +0200 Subject: [PATCH] MycroftOS: Migrating to new wifi-connect system. --- .../rootfs-overlay/etc/dnsmasq.conf | 2 -- .../rootfs-overlay/etc/nginx/nginx.conf | 28 ------------------ .../etc/systemd/network/ap0.network | 7 ----- .../etc/systemd/network/wlan0.network | 6 ---- .../usr/lib/systemd/scripts/iptables-flush | 18 ----------- .../share/wifi-connect/ui/asset-manifest.json | 0 .../local/share/wifi-connect/ui/index.html | 0 ...nifest.a619d5c0df1bb38186cdf977820ec568.js | 0 .../share/wifi-connect/ui/service-worker.js | 0 .../ui/static/css/main.7c90acc6.chunk.css | 0 .../share/wifi-connect/ui/static/favicon.png | Bin .../ui/static/js/2.c530163b.chunk.js | 0 .../static/js/2.c530163b.chunk.js.LICENSE.txt | 0 .../ui/static/js/main.fbfa97b4.chunk.js | 0 .../ui/static/js/runtime-main.2a78626f.js | 0 .../wifi-connect/ui/static/manifest.json | 0 .../ui/static/media/logo.69120045.svg | 0 17 files changed, 61 deletions(-) delete mode 100644 buildroot-external/board/raspberrypi/rootfs-overlay/etc/dnsmasq.conf delete mode 100644 buildroot-external/board/raspberrypi/rootfs-overlay/etc/nginx/nginx.conf delete mode 100644 buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/ap0.network delete mode 100644 buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/wlan0.network delete mode 100755 buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/scripts/iptables-flush rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/asset-manifest.json (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/index.html (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/precache-manifest.a619d5c0df1bb38186cdf977820ec568.js (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/service-worker.js (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/css/main.7c90acc6.chunk.css (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/favicon.png (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js.LICENSE.txt (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/main.fbfa97b4.chunk.js (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/runtime-main.2a78626f.js (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/manifest.json (100%) rename buildroot-external/{board/raspberrypi4-64 => }/rootfs-overlay/usr/local/share/wifi-connect/ui/static/media/logo.69120045.svg (100%) diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/dnsmasq.conf b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/dnsmasq.conf deleted file mode 100644 index 56ebb632..00000000 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/dnsmasq.conf +++ /dev/null @@ -1,2 +0,0 @@ -interface=ap0 -address=/#/172.16.127.1 diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/nginx/nginx.conf b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/nginx/nginx.conf deleted file mode 100644 index cce3b5de..00000000 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/nginx/nginx.conf +++ /dev/null @@ -1,28 +0,0 @@ - -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 172.16.127.1:80; - server_name MycroftOS; - root /opt/mycroft/wifisetup/templates; - - # For iOS - if ($http_user_agent ~* (CaptiveNetworkSupport) ) { - return 302 http://172.16.127.1:88/hotspot.html; - } - # For others - location / { - return 302 http://172.16.127.1:88/; - } - } -} diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/ap0.network b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/ap0.network deleted file mode 100644 index e8c7431e..00000000 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/ap0.network +++ /dev/null @@ -1,7 +0,0 @@ -[Match] -Name=ap0 -[Network] -Address=172.16.127.1/28 -DHCPServer=yes -[DHCPServer] -DNS=172.16.127.1 diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/wlan0.network b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/wlan0.network deleted file mode 100644 index 6802b757..00000000 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/systemd/network/wlan0.network +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Name=wlan0 -[Network] -DHCP=ipv4 -[DHCP] -RouteMetric=20 diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/scripts/iptables-flush b/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/scripts/iptables-flush deleted file mode 100755 index e6fafe95..00000000 --- a/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/scripts/iptables-flush +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Usage: iptables-flush [6] -# - -iptables=ip$1tables -if ! type -p "$iptables"; then - echo "error: invalid argument" - exit 1 -fi - -while read -r table; do - tables+=("/var/lib/$iptables/empty-$table.rules") -done <"/proc/net/ip$1_tables_names" - -if (( ${#tables[*]} )); then - cat "${tables[@]}" | "$iptables-restore" -fi diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/asset-manifest.json b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/asset-manifest.json similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/asset-manifest.json rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/asset-manifest.json diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/index.html b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/index.html similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/index.html rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/index.html diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/precache-manifest.a619d5c0df1bb38186cdf977820ec568.js b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/precache-manifest.a619d5c0df1bb38186cdf977820ec568.js similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/precache-manifest.a619d5c0df1bb38186cdf977820ec568.js rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/precache-manifest.a619d5c0df1bb38186cdf977820ec568.js diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/service-worker.js b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/service-worker.js similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/service-worker.js rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/service-worker.js diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/css/main.7c90acc6.chunk.css b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/css/main.7c90acc6.chunk.css similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/css/main.7c90acc6.chunk.css rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/css/main.7c90acc6.chunk.css diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/favicon.png b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/favicon.png similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/favicon.png rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/favicon.png diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js.LICENSE.txt b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js.LICENSE.txt similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js.LICENSE.txt rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/2.c530163b.chunk.js.LICENSE.txt diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/main.fbfa97b4.chunk.js b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/main.fbfa97b4.chunk.js similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/main.fbfa97b4.chunk.js rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/main.fbfa97b4.chunk.js diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/runtime-main.2a78626f.js b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/runtime-main.2a78626f.js similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/runtime-main.2a78626f.js rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/js/runtime-main.2a78626f.js diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/manifest.json b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/manifest.json similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/manifest.json rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/manifest.json diff --git a/buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/media/logo.69120045.svg b/buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/media/logo.69120045.svg similarity index 100% rename from buildroot-external/board/raspberrypi4-64/rootfs-overlay/usr/local/share/wifi-connect/ui/static/media/logo.69120045.svg rename to buildroot-external/rootfs-overlay/usr/local/share/wifi-connect/ui/static/media/logo.69120045.svg