From f12a8df537a1ba15803568fbf748a3d4b320a7ac Mon Sep 17 00:00:00 2001 From: Zahari Petkov Date: Thu, 18 Oct 2018 16:40:36 +0300 Subject: [PATCH] Change company name Change-type: patch Signed-off-by: Zahari Petkov --- .circleci/config.yml | 4 +- Cargo.lock | 8 ++-- Cargo.toml | 2 +- Dockerfile.template | 2 +- README.md | 38 ++++++++-------- scripts/raspbian-install.sh | 2 +- ui/img/logo.svg | 89 ++++++++++++++++++++++++++----------- ui/index.html | 1 - 8 files changed, 90 insertions(+), 56 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac6db655..5f138dc1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,8 +81,8 @@ jobs: - image: majorz/rust-test-deploy:rust-nightly-2018-01-08 environment: - GITHUB_USER: resin-io - GITHUB_REPO: resin-wifi-connect + GITHUB_USER: balena-io + GITHUB_REPO: wifi-connect steps: - checkout diff --git a/Cargo.lock b/Cargo.lock index 110e61d6..fec30dcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -340,8 +340,8 @@ dependencies = [ [[package]] name = "network-manager" -version = "0.10.0" -source = "git+https://github.com/resin-io-modules/network-manager?branch=118-wpa-eap#a6fc4e55f9a4b34e8de7350eadc1f90a51e046d4" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -870,7 +870,7 @@ dependencies = [ "iron-cors 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "network-manager 0.10.0 (git+https://github.com/resin-io-modules/network-manager?branch=118-wpa-eap)", + "network-manager 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "params 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "persistent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -948,7 +948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" "checksum mount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e25c06012941aaf8c75f2eaf7ec5c48cf69f9fc489ab3eb3589edc107e386f0b" "checksum multipart 0.13.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92f54eb45230c3aa20864ccf0c277eeaeadcf5e437e91731db498dbf7fbe0ec6" -"checksum network-manager 0.10.0 (git+https://github.com/resin-io-modules/network-manager?branch=118-wpa-eap)" = "" +"checksum network-manager 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8153439bd953eba4f6e7198ddbdc01badc246f39b0d7b3c79a997b390f76b1be" "checksum nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fd5681d13fda646462cfbd4e5f2051279a89a544d50eb98c365b507246839f" "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" "checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" diff --git a/Cargo.toml b/Cargo.toml index b5c7cc8e..e439162c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wifi-connect" version = "4.2.1" -authors = ["Zahari Petkov ", "Aaron Brodersen "] +authors = ["Zahari Petkov "] description = "Easy WiFi setup for Linux devices from your mobile phone or laptop" [dependencies] diff --git a/Dockerfile.template b/Dockerfile.template index db5e9e46..f6205ff3 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -9,7 +9,7 @@ RUN apt-get update \ WORKDIR /usr/src/app -RUN curl https://api.github.com/repos/resin-io/resin-wifi-connect/releases/latest -s \ +RUN curl https://api.github.com/repos/balena-io/wifi-connect/releases/latest -s \ | grep -hoP 'browser_download_url": "\K.*%%RESIN_ARCH%%\.tar\.gz' \ | xargs -n1 curl -Ls \ | tar -xvz -C /usr/src/app/ diff --git a/README.md b/README.md index f0693358..37d0310b 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -

+

> Easy WiFi setup for Linux devices from your mobile phone or laptop WiFi Connect is a utility for dynamically setting the WiFi configuration on a Linux device via a captive portal. WiFi credentials are specified by connecting with a mobile phone or laptop to the access point that WiFi Connect creates. -[![Current Release](https://img.shields.io/github/release/resin-io/resin-wifi-connect.svg?style=flat-square)](https://github.com/resin-io/resin-wifi-connect/releases/latest) -[![CircleCI status](https://img.shields.io/circleci/project/github/resin-io/resin-wifi-connect.svg?style=flat-square)](https://circleci.com/gh/resin-io/resin-wifi-connect) -[![License](https://img.shields.io/github/license/resin-io/resin-wifi-connect.svg?style=flat-square)](https://github.com/resin-io/resin-wifi-connect/blob/master/LICENSE) -[![Issues](https://img.shields.io/github/issues/resin-io/resin-wifi-connect.svg?style=flat-square)](https://github.com/resin-io/resin-wifi-connect/issues) +[![Current Release](https://img.shields.io/github/release/balena-io/wifi-connect.svg?style=flat-square)](https://github.com/balena-io/wifi-connect/releases/latest) +[![CircleCI status](https://img.shields.io/circleci/project/github/balena-io/wifi-connect.svg?style=flat-square)](https://circleci.com/gh/balena-io/wifi-connect) +[![License](https://img.shields.io/github/license/balena-io/wifi-connect.svg?style=flat-square)](https://github.com/balena-io/wifi-connect/blob/master/LICENSE) +[![Issues](https://img.shields.io/github/issues/balena-io/wifi-connect.svg?style=flat-square)](https://github.com/balena-io/wifi-connect/issues)
- an open source :satellite: project by resin.io + an open source :satellite: project by balena.io
*** -[**Download**][DOWNLOAD] | [**How it works**](#how-it-works) | [**How to use**](#how-to-use) | [**Support**](#support) | [**Roadmap**][MILESTONES] +[**Download**][DOWNLOAD] | [**How it works**](#how-it-works) | [**Installation**](#installation) | [**Support**](#support) | [**Roadmap**][MILESTONES] -[DOWNLOAD]: https://github.com/resin-io/resin-wifi-connect/releases/latest -[MILESTONES]: https://github.com/resin-io/resin-wifi-connect/milestones +[DOWNLOAD]: https://github.com/balena-io/wifi-connect/releases/latest +[MILESTONES]: https://github.com/balena-io/wifi-connect/milestones ![How it works](./docs/images/how-it-works.png?raw=true) @@ -33,7 +33,7 @@ WiFi Connect detects available WiFi networks and opens an access point with a ca ### 2. Connect: User Connects Phone to Device Access Point -Connect to the opened access point on the device from your mobile phone or laptop. The access point SSID is, by default, `WiFi Connect`. It can be changed by setting the `--portal-ssid` command line argument or the `PORTAL_SSID` environment variable (see [this guide](https://docs.resin.io/management/env-vars/) for how to manage environment variables when running on top of resinOS). By default, the network is unprotected, but a WPA2 passphrase can be added by setting the `--portal-passphrase` command line argument or the `PORTAL_PASSPHRASE` environment variable. +Connect to the opened access point on the device from your mobile phone or laptop. The access point SSID is, by default, `WiFi Connect`. It can be changed by setting the `--portal-ssid` command line argument or the `PORTAL_SSID` environment variable (see [this guide](https://balena.io/docs/management/env-vars/) for how to manage environment variables when running on top of balenaOS). By default, the network is unprotected, but a WPA2 passphrase can be added by setting the `--portal-passphrase` command line argument or the `PORTAL_PASSPHRASE` environment variable. ### 3. Portal: Phone Shows Captive Portal to User @@ -58,7 +58,7 @@ The full application flow is illustrated in the [state flow diagram](./docs/stat Installation ------------ -WiFi Connect is designed to work on systems like Raspbian or Debian, or run in a docker container on top of resinOS. +WiFi Connect is designed to work on systems like Raspbian or Debian, or run in a docker container on top of balenaOS. ### Raspbian/Debian Stretch @@ -66,14 +66,14 @@ WiFi Connect depends on NetworkManager, but by default Raspbian Stretch uses dhc Run the following in your terminal, then follow the onscreen instructions: -`bash <(curl -L https://github.com/resin-io/resin-wifi-connect/raw/master/scripts/raspbian-install.sh)` +`bash <(curl -L https://github.com/balena-io/wifi-connect/raw/master/scripts/raspbian-install.sh)` -### resinOS +### balenaOS -WiFi Connect can be integrated with a [resin.io](http://resin.io) application. (New to resin.io? Check out the [Getting Started Guide](http://docs.resin.io/#/pages/installing/gettingStarted.md).) This integration is accomplished through the use of two shared files: -- The [Dockerfile template](./Dockerfile.template) manages dependencies. The example included here has everything necessary for WiFi Connect. Application dependencies need to be added. For help with Dockerfiles, take a look at this [guide](https://docs.resin.io/deployment/dockerfile/). +WiFi Connect can be integrated with a [balena.io](http://balena.io) application. (New to balena.io? Check out the [Getting Started Guide](https://balena.io/docs/#/pages/installing/gettingStarted.md).) This integration is accomplished through the use of two shared files: +- The [Dockerfile template](./Dockerfile.template) manages dependencies. The example included here has everything necessary for WiFi Connect. Application dependencies need to be added. For help with Dockerfiles, take a look at this [guide](https://balena.io/docs/deployment/dockerfile/). - The [start script](./scripts/start.sh) should contain the commands that run the application. Adding these commands at the end of the script will ensure that everything kicks off after WiFi is correctly configured. -An example of using WiFi Connect in a Python project can be found [here](https://github.com/resin-io-projects/resin-wifi-connect-example). +An example of using WiFi Connect in a Python project can be found [here](https://github.com/balena-io-projects/wifi-connect-example). *** @@ -100,14 +100,14 @@ The following dongles are known **not** to work (as the driver is not friendly w Dongles with similar chipsets will probably not work. -WiFi Connect is expected to work with all resin.io supported boards as long as they have the compatible dongles. +WiFi Connect is expected to work with all balena.io supported boards as long as they have the compatible dongles. *** Support ------- -If you're having any problem, please [raise an issue](https://github.com/resin-io/resin-wifi-connect/issues/new) on GitHub or [contact us](https://resin.io/community/), and the resin.io team will be happy to help. +If you're having any problem, please [raise an issue](https://github.com/balena-io/wifi-connect/issues/new) on GitHub or [contact us](https://balena.io/community/), and the balena.io team will be happy to help. *** @@ -115,4 +115,4 @@ License ------- WiFi Connect is free software, and may be redistributed under the terms specified in -the [license](https://github.com/resin-io/resin-wifi-connect/blob/master/LICENSE). +the [license](https://github.com/balena-io/wifi-connect/blob/master/LICENSE). diff --git a/scripts/raspbian-install.sh b/scripts/raspbian-install.sh index ef298be1..6197abe3 100755 --- a/scripts/raspbian-install.sh +++ b/scripts/raspbian-install.sh @@ -5,7 +5,7 @@ set -u trap "exit 1" TERM export TOP_PID=$$ -: "${WFC_REPO:=resin-io/resin-wifi-connect}" +: "${WFC_REPO:=balena-io/wifi-connect}" : "${WFC_INSTALL_ROOT:=/usr/local}" SCRIPT='raspbian-install.sh' diff --git a/ui/img/logo.svg b/ui/img/logo.svg index ae052fa1..6b7564c4 100644 --- a/ui/img/logo.svg +++ b/ui/img/logo.svg @@ -1,30 +1,65 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/ui/index.html b/ui/index.html index 6f945649..5ca50e97 100644 --- a/ui/index.html +++ b/ui/index.html @@ -36,7 +36,6 @@
- resin.io