MycroftOS: Remove wifi-ap in favor of wifi-connect.
This commit is contained in:
parent
41509b087e
commit
4f9862d495
|
@ -6,7 +6,6 @@ menu "Mycroft A.I. Personal Assistant"
|
|||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-gui-embedded/Config.in"
|
||||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-service/Config.in"
|
||||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-splash/Config.in"
|
||||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/wifi-ap/Config.in"
|
||||
menu "Additional drivers, libraries and/or applications"
|
||||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/alsa-plugins/Config.in"
|
||||
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/baresip/Config.in"
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
config BR2_PACKAGE_WIFI_AP
|
||||
bool "wifi-ap"
|
||||
help
|
||||
Start a wifi AP when there is no wifi
|
||||
configuration present.
|
||||
|
||||
https://www.j1nx.nl
|
|
@ -1,15 +0,0 @@
|
|||
[Unit]
|
||||
Description=Small DNS server to resolve everything to the AP interface.
|
||||
BindsTo=sys-subsystem-net-devices-ap0.device
|
||||
After=sys-subsystem-net-devices-ap0.device
|
||||
Before=network.target
|
||||
Wants=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/dnsmasq -k --conf-file=/etc/dnsmasq.conf
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=sys-subsystem-net-devices-ap0.device
|
|
@ -1,18 +0,0 @@
|
|||
[Unit]
|
||||
Description=A high performance web server and a reverse proxy server
|
||||
BindsTo=sys-subsystem-net-devices-ap0.device
|
||||
After=sys-subsystem-net-devices-ap0.device wpa_supplicant@ap0.service
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/nginx.pid
|
||||
ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
|
||||
ExecStartPre=/usr/bin/sleep 5
|
||||
ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
|
||||
ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
|
||||
ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload
|
||||
ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit
|
||||
PrivateDevices=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=wpa_supplicant@ap0.service
|
|
@ -1,31 +0,0 @@
|
|||
################################################################################
|
||||
#
|
||||
# wifi-ap
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WIFI_AP_VERSION = 0.1.0
|
||||
WIFI_AP_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/wifi-ap
|
||||
WIFI_AP_SITE_METHOD = local
|
||||
WIFI_AP_LICENSE = Apache License 2.0
|
||||
WIFI_AP_LICENSE_FILES = LICENSE
|
||||
|
||||
define WIFI_AP_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/etc/wpa_supplicant
|
||||
$(INSTALL) -m 644 -D $(@D)/wpa_supplicant-ap0.conf \
|
||||
$(TARGET_DIR)/etc/wpa_supplicant/wpa_supplicant-ap0.conf
|
||||
|
||||
$(INSTALL) -D -m 644 $(@D)/wpa_supplicant@ap0.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant@ap0.service
|
||||
|
||||
$(INSTALL) -D -m 644 $(@D)/wifi-setup.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wifi-setup.service
|
||||
|
||||
$(INSTALL) -D -m 644 $(@D)/dnsmasq.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/dnsmasq.service
|
||||
|
||||
$(INSTALL) -D -m 644 $(@D)/nginx.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/nginx.service
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
|
@ -1,14 +0,0 @@
|
|||
[Unit]
|
||||
Description=MycroftOS WiFi Setup - webbased configurator
|
||||
After=wpa_supplicant@ap0.service
|
||||
Wants=wpa_supplicant@ap0.service
|
||||
Before=network.target
|
||||
Wants=network.target
|
||||
|
||||
[Service]
|
||||
Type=idle
|
||||
WorkingDirectory=/opt/mycroft/wifisetup
|
||||
ExecStart=/usr/bin/python3 app.py > /dev/null 2>&1
|
||||
|
||||
[Install]
|
||||
WantedBy=wpa_supplicant@ap0.service
|
|
@ -1,8 +0,0 @@
|
|||
ctrl_interface=/var/run/wpa_supplicant
|
||||
update_config=1
|
||||
|
||||
network={
|
||||
ssid="MYCROFT"
|
||||
mode=2
|
||||
key_mgmt=NONE
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
[Unit]
|
||||
Description=WPA supplicant daemon (interface-specific version)
|
||||
Requires=sys-subsystem-net-devices-wlan0.device
|
||||
After=sys-subsystem-net-devices-wlan0.device
|
||||
Conflicts=wpa_supplicant@wlan0.service
|
||||
Before=network.target
|
||||
Wants=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStartPre=/usr/sbin/iw dev wlan0 interface add ap0 type __ap
|
||||
ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-ap0.conf -Dnl80211,wext -iap0
|
||||
ExecStopPost=/usr/sbin/iw dev ap0 del
|
||||
|
||||
[Install]
|
||||
Alias=multi-user.target.wants/wpa_supplicant@%i.service
|
Loading…
Reference in New Issue