From 13cc41eb7276bc6690ce978ade1820402e3b7dfd Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Fri, 1 Jun 2018 21:17:37 -0700 Subject: [PATCH 01/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae38633..6322f7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -**Update - 20180429**: Due to my day job taking up some additional time, version 2 will be released in 2-3 weeks. I am shooting for June at the latest. If you are interested in joining this project as a contributor please open an issue. Version 2 aims to split up the host and client functionality and add more fine-grain control and configuration. I also have a contributor interested in releasing a web GUI as an add-on. The essence of the project will however remain JSON based API control of wifi. +**Update - 20180601**: Created a new fork at https://github.com/txn2/txwifi where any future development should happen. **Looking for contributors**. If you are interested in joining the [txn2][https://txn2.com] team please send an email with your github username to human@txn2.com. **Update**: Tested and functioning on well on the [Raspberry Pi 3 B+](https://amzn.to/2jfXhCA) and [Raspberry Pi 3 B](https://amzn.to/2Kq9Doa). Looking to support additional SOCs in upcoming versions. (Disclosure: the Pi links to Amazon are affiliate links, why not?) From f3ef7d76dc8a8b1e68ca8454bd35c10f245f3077 Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Fri, 1 Jun 2018 21:18:07 -0700 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6322f7a..e1ccab9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -**Update - 20180601**: Created a new fork at https://github.com/txn2/txwifi where any future development should happen. **Looking for contributors**. If you are interested in joining the [txn2][https://txn2.com] team please send an email with your github username to human@txn2.com. +**Update - 20180601**: Created a new fork at https://github.com/txn2/txwifi where any future development should happen. **Looking for contributors**. If you are interested in joining the [txn2](https://txn2.com) team please send an email with your github username to human@txn2.com. **Update**: Tested and functioning on well on the [Raspberry Pi 3 B+](https://amzn.to/2jfXhCA) and [Raspberry Pi 3 B](https://amzn.to/2Kq9Doa). Looking to support additional SOCs in upcoming versions. (Disclosure: the Pi links to Amazon are affiliate links, why not?) From cd9dc046bc0b92d1343bdc6ca178e8285ad0eba3 Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Tue, 5 Jun 2018 20:13:00 -0700 Subject: [PATCH 03/11] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e1ccab9..7ea9e15 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,10 @@ with the **IOT Wifi** container. # prevent wpa_supplicant from starting on boot $ sudo systemctl mask wpa_supplicant.service +# rename wpa_supplicant on the host to ensure that it is not +# used. +sudo mv /sbin/wpa_supplicant /sbin/no_wpa_supplicant + # kill any running processes named wpa_supplicant $ sudo pkill wpa_supplicant ``` From de1e8f0f329202bae7765c7a6cc018f669fe9249 Mon Sep 17 00:00:00 2001 From: breandan Date: Thu, 16 Aug 2018 14:42:10 -0400 Subject: [PATCH 04/11] Add readme instructions to mount host's wpa_supplicant.conf, fixes #17 --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 7ea9e15..0bb6cd3 100644 --- a/README.md +++ b/README.md @@ -194,6 +194,17 @@ $ docker run --rm --privileged --net host \ cjimti/iotwifi ``` +Optionally, you can also provide a `wpa_supplicant.conf`, like so: + +```bash +$ docker run --rm --privileged --net host \ + -v $(pwd)/wificfg.json:/cfg/wificfg.json \ + -v /wpa_supplicant.conf:/wpa_supplicant.conf \ + cjimti/iotwifi +``` + +Where `` is the path to `wpa_supplicant.conf` specified in `wificfg.json`. + The IOT Wifi container outputs logs in the JSON format. While this makes them a bit more challenging to read, we can feed them directly (or indirectly) into tools like Elastic Search or other databases for alerting or analytics. From 02947a2c27498b106474c765956f18472a7a6f0c Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Sun, 19 Aug 2018 18:08:07 -0700 Subject: [PATCH 05/11] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0bb6cd3..79af029 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -**Update - 20180601**: Created a new fork at https://github.com/txn2/txwifi where any future development should happen. **Looking for contributors**. If you are interested in joining the [txn2](https://txn2.com) team please send an email with your github username to human@txn2.com. - -**Update**: Tested and functioning on well on the [Raspberry Pi 3 B+](https://amzn.to/2jfXhCA) and [Raspberry Pi 3 B](https://amzn.to/2Kq9Doa). Looking to support additional SOCs in upcoming versions. (Disclosure: the Pi links to Amazon are affiliate links, why not?) +**Update**: Looking for contributors. # IOT Wifi (Raspberry Pi AP + Client) From 7ddbc18611a22d78418b8fd4d6267f2b50077e5c Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Thu, 22 Nov 2018 00:05:02 -0800 Subject: [PATCH 06/11] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 79af029..29604a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ -**Update**: Looking for contributors. +**Update**: Looking for contributors. + +**NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionaly common to deivces like Nest or Echo, where the user turns on the deice, connects to it and confiures it for wifi. + +**This is not a captive portal project. While I have personaly used it for this, it requires additional netoworking and can be higly unstable. I don't support this use and so your millage may vary.*** + +**iotwifi** is only expected to run properly on stock Raspberry Pis not not tested on any other hardware configurations. # IOT Wifi (Raspberry Pi AP + Client) From 36acd9fd5f3c58c013492b864b93b2a18ec5f075 Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Thu, 22 Nov 2018 00:09:18 -0800 Subject: [PATCH 07/11] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 29604a5..bd55bfb 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -**Update**: Looking for contributors. +**Update**: Looking for contributors / maintainers. -**NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionaly common to deivces like Nest or Echo, where the user turns on the deice, connects to it and confiures it for wifi. +**NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionaly common to deivces like Nest or Echo, where the user turns on the device, connects to it and confiures it for wifi. I have over 800 devices running this software in production and all have had their wifi configured using it. -**This is not a captive portal project. While I have personaly used it for this, it requires additional netoworking and can be higly unstable. I don't support this use and so your millage may vary.*** +**This is not a captive portal project. While I have personaly used it for this, it requires additional networking and can be unstable. I don't support this use and so your millage may vary.*** **iotwifi** is only expected to run properly on stock Raspberry Pis not not tested on any other hardware configurations. From 3253a3357deebdd114edc13f61b508d9353c6ed7 Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Thu, 22 Nov 2018 00:10:23 -0800 Subject: [PATCH 08/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd55bfb..80946b5 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ **NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionaly common to deivces like Nest or Echo, where the user turns on the device, connects to it and confiures it for wifi. I have over 800 devices running this software in production and all have had their wifi configured using it. -**This is not a captive portal project. While I have personaly used it for this, it requires additional networking and can be unstable. I don't support this use and so your millage may vary.*** +**This is not a captive portal project. While I have personaly used it for this, it requires additional networking and can be unstable. I don't support this use and so your millage may vary.** -**iotwifi** is only expected to run properly on stock Raspberry Pis not not tested on any other hardware configurations. +**iotwifi** is only expected to run properly on stock Raspberry Pis and not tested on any other hardware configurations. # IOT Wifi (Raspberry Pi AP + Client) From 0bd9d24fbcfcdbff7598a7e4db8b5f3736ad2ba8 Mon Sep 17 00:00:00 2001 From: Craig Johnston Date: Sat, 1 Dec 2018 21:04:57 -0800 Subject: [PATCH 09/11] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 80946b5..7f88741 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ +**Update** 2018-12-01. I am archiving this project. The original use case was to enable the configuration of wifi, over wifi, like many IOT devices on the market. It has worked well for me for this purpose. However, many of the issues people have been reporting as bugs are simply other opinions on how it should work for them, and outside of the original use case. Unfortunately, I don't have the personal resources to help in these requests. If others are willing to be contributors I would be grateful; until then, this project is for reference only. + **Update**: Looking for contributors / maintainers. -**NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionaly common to deivces like Nest or Echo, where the user turns on the device, connects to it and confiures it for wifi. I have over 800 devices running this software in production and all have had their wifi configured using it. +**NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionality common to devices like Nest or Echo, where the user turns on the device, connects to it and configures it for wifi. I have over 800 devices running this software in production and all have had their wifi configured using it. **This is not a captive portal project. While I have personaly used it for this, it requires additional networking and can be unstable. I don't support this use and so your millage may vary.** From c8e318db86834e41fad7742e15ac3ec7b3172235 Mon Sep 17 00:00:00 2001 From: Leland Sindt Date: Mon, 28 Jan 2019 19:58:17 -0600 Subject: [PATCH 10/11] migrate from cjimti/iotwifi to txn2/txwifi some images still reference cjmti/iotwifi and the docker hub/container links still point to cjimti/iotwifi --- Dockerfile | 6 +++--- Godeps/Godeps.json | 2 +- Makefile | 6 +++--- README.md | 10 +++++----- dev/Dockerfile | 2 +- main.go | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9bd367..9c5e391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM arm32v6/golang:1.10.1-alpine3.7 AS builder ENV GOPATH /go WORKDIR /go/src -RUN mkdir -p /go/src/github.com/cjimti/iotwifi -COPY . /go/src/github.com/cjimti/iotwifi +RUN mkdir -p /go/src/github.com/txn2/txwifi +COPY . /go/src/github.com/txn2/txwifi -RUN CGO_ENABLED=0 go build -a -installsuffix cgo -o /go/bin/wifi /go/src/github.com/cjimti/iotwifi/main.go +RUN CGO_ENABLED=0 go build -a -installsuffix cgo -o /go/bin/wifi /go/src/github.com/txn2/txwifi/main.go FROM arm32v6/alpine diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1066e99..0b271bd 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/cjimti/iotwifi", + "ImportPath": "github.com/txn2/txwifi", "GoVersion": "go1.9", "GodepVersion": "v80", "Deps": [ diff --git a/Makefile b/Makefile index f62fdea..26db6db 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ IMAGE ?= cjimti/iotwifi -NAME ?= iotwifi +NAME ?= txwifi VERSION ?= 1.0.4 all: build push @@ -19,8 +19,8 @@ dev_build: dev_run: sudo docker run --rm -it --privileged --network=host \ - -v $(CURDIR):/go/src/github.com/cjimti/iotwifi \ - -w /go/src/github.com/cjimti/iotwifi \ + -v $(CURDIR):/go/src/github.com/txn2/txwifi \ + -w /go/src/github.com/txn2/txwifi \ --name=$(NAME) $(IMAGE):latest diff --git a/README.md b/README.md index 7f88741..052b116 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ **This is not a captive portal project. While I have personaly used it for this, it requires additional networking and can be unstable. I don't support this use and so your millage may vary.** -**iotwifi** is only expected to run properly on stock Raspberry Pis and not tested on any other hardware configurations. +**txwifi** is only expected to run properly on stock Raspberry Pis and not tested on any other hardware configurations. # IOT Wifi (Raspberry Pi AP + Client) -[![Go Report Card](https://goreportcard.com/badge/github.com/cjimti/iotwifi)](https://goreportcard.com/report/github.com/cjimti/iotwifi) -[![GoDoc](https://godoc.org/github.com/cjimti/iotwifi/iotwifi?status.svg)](https://godoc.org/github.com/cjimti/iotwifi/iotwifi) +[![Go Report Card](https://goreportcard.com/badge/github.com/txn2/txwifi)](https://goreportcard.com/report/github.com/txn2/txwifi) +[![GoDoc](https://godoc.org/github.com/txn2/txwifi/iotwifi?status.svg)](https://godoc.org/github.com/txn2/txwifi/iotwifi) [![Docker Container Image Size](https://shields.beevelop.com/docker/image/image-size/cjimti/iotwifi/latest.svg)](https://hub.docker.com/r/cjimti/iotwifi/) [![Docker Container Layers](https://shields.beevelop.com/docker/image/layers/cjimti/iotwifi/latest.svg)](https://hub.docker.com/r/cjimti/iotwifi/) [![Docker Container Pulls](https://img.shields.io/docker/pulls/cjimti/iotwifi.svg)](https://hub.docker.com/r/cjimti/iotwifi/) @@ -131,7 +131,7 @@ started quickly I'll show you how to use a pre-built Docker Image. At only 16MB this little image contains everything you need. The image is based on [Alpine Linux] and contains [hostapd], [wpa_supplicant] and [dnsmasq], along with a compiled wifi management utility written in go, -the source is found in this repository: https://github.com/cjimti/iotwifi. +the source is found in this repository: https://github.com/txn2/txwifi. ```bash # Pull the IOT Wifi Docker Image @@ -152,7 +152,7 @@ Use the default configuration file and location for testing: ```bash # Download the default configuration file -$ wget https://raw.githubusercontent.com/cjimti/iotwifi/master/cfg/wificfg.json +$ wget https://raw.githubusercontent.com/txn2/txwifi/master/cfg/wificfg.json ``` diff --git a/dev/Dockerfile b/dev/Dockerfile index 79dce66..bc729c7 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -6,7 +6,7 @@ RUN apk add alpine-sdk go bridge hostapd wireless-tools wireless-tools-dev wpa_s RUN mkdir -p /etc/wpa_supplicant/ COPY ./configs/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf -RUN mkdir -p /go/src/github.com/cjimti/iotwifi/ +RUN mkdir -p /go/src/github.com/tnx2/txwifi/ ENV GOPATH /go WORKDIR /go/src diff --git a/main.go b/main.go index 2f6a1a3..c747a75 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/bhoriuchi/go-bunyan/bunyan" - "github.com/cjimti/iotwifi/iotwifi" "github.com/gorilla/handlers" "github.com/gorilla/mux" + "github.com/txn2/txwifi/iotwifi" ) // ApiReturn structures a message for returned API calls. @@ -25,7 +25,7 @@ type ApiReturn struct { func main() { logConfig := bunyan.Config{ - Name: "iotwifi", + Name: "txwifi", Stream: os.Stdout, Level: bunyan.LogLevelDebug, } From 00b8ac0c18663c79f6f0a29ee388cc9d2b522ddf Mon Sep 17 00:00:00 2001 From: Leland Sindt Date: Mon, 28 Jan 2019 20:15:53 -0600 Subject: [PATCH 11/11] fix/merg readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 052b116..5f762f5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -**Update** 2018-12-01. I am archiving this project. The original use case was to enable the configuration of wifi, over wifi, like many IOT devices on the market. It has worked well for me for this purpose. However, many of the issues people have been reporting as bugs are simply other opinions on how it should work for them, and outside of the original use case. Unfortunately, I don't have the personal resources to help in these requests. If others are willing to be contributors I would be grateful; until then, this project is for reference only. +**Update - 20180601**: Any future development will happen on this new fork. Hoping add stability as well as new SOCs. If you are interesrted in joining the [txn2](https://txn2.com) team please email human@txn2.com. -**Update**: Looking for contributors / maintainers. +**Update**: Tested and functioning on well on the [Raspberry Pi 3 B+](https://amzn.to/2jfXhCA) and [Raspberry Pi 3 B](https://amzn.to/2Kq9Doa). Looking to support additional SOCs in upcoming versions. (Disclosure: the Pi links to Amazon are affiliate links, why not?) **NOTICE**: This project is intended to aid in developing "configure wifi over wifi" solutions for IOT projects using the Raspberry Pi. The main use case for this project is to reproduce functionality common to devices like Nest or Echo, where the user turns on the device, connects to it and configures it for wifi. I have over 800 devices running this software in production and all have had their wifi configured using it.