diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9859b006..a2fbbfc2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ assignees: ''
All submitters MUST read this first https://docs.raspap.com/issues/
-Have a question or want to suggest a feature? Start or join a discussion https://github.com/billz/raspap-webgui/discussions
+Have a question or want to suggest a feature? Start or join a discussion https://github.com/raspap/raspap-webgui/discussions
* [ ] This is a bug report
* [ ] I searched existing issues before opening this one
diff --git a/README.md b/README.md
index 79a22e6c..ffebbbf8 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
![](https://i.imgur.com/xeKD93p.png)
-[![Release 2.6](https://img.shields.io/badge/release-v2.6-green)](https://github.com/billz/raspap/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/github/billz/raspap-webgui/](https://api.travis-ci.com/billz/raspap.svg?branch=master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
+[![Release 2.6](https://img.shields.io/badge/release-v2.6-green)](https://github.com/raspap/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/github/raspap/raspap-webgui/](https://api.travis-ci.com/raspap/raspap-webgui.svg?branch=master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
RaspAP lets you quickly get a wireless access point up and running to share the connectivity of many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A responsive interface gives you control over the relevant services and networking options. Advanced DHCP settings, OpenVPN client support, SSL, security audits, themes and multilingual options are included.
RaspAP has been featured on sites such as [Instructables](http://www.instructables.com/id/Raspberry-Pi-As-Completely-Wireless-Router/), [Adafruit](https://blog.adafruit.com/2016/06/24/raspap-wifi-configuration-portal-piday-raspberrypi-raspberry_pi/), [Raspberry Pi Weekly](https://www.raspberrypi.org/weekly/commander/) and [Awesome Raspberry Pi](https://project-awesome.org/thibmaek/awesome-raspberry-pi) and implemented in countless projects.
-We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use this with [your own projects](https://github.com/billz/raspap-awesome).
+We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use this with [your own projects](https://github.com/raspap/raspap-awesome).
![](https://i.imgur.com/ikWvsMG.gif)
![](https://i.imgur.com/EiIpdOS.gif)
@@ -173,7 +173,7 @@ Please [read this](https://docs.raspap.com/issues/) before reporting a bug.
### Code Contributors
This project exists thanks to all the awesome people who [contribute](CONTRIBUTING.md) their time and expertise.
-
+
### Financial Contributors
Become a [financial contributor](https://opencollective.com/raspap/contribute) and help us sustain our community.
diff --git a/composer.json b/composer.json
index 4b0f48c0..ed4f5e8f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
- "name": "billz/raspap-webgui",
- "description": "Simple AP setup and wifi mangement for Debian-based devices",
+ "name": "raspap/raspap-webgui",
+ "description": "Simple wireless AP setup and mangement for Debian-based devices",
"license": "GPL-3.0",
"homepage": "https://raspap.com/",
"keywords": ["raspberrypi", "debian", "armbian", "wifi"],
diff --git a/gulpfile.js b/gulpfile.js
index 9f3833e3..965198e3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,7 @@ const pkg = require('./package.json');
const banner = ['/*!\n',
' * RaspAP - <%= pkg.title %> v<%= pkg.version %> (<%= pkg.homepage %>)\n',
' * Copyright 2013-' + (new Date()).getFullYear(), ' <%= pkg.author %>\n',
- ' * Licensed under <%= pkg.license %> (https://github.com/billz/raspap/<%= pkg.name %>/blob/master/LICENSE)\n',
+ ' * Licensed under <%= pkg.license %> (https://github.com/raspap/raspap-webgui/<%= pkg.name %>/blob/master/LICENSE)\n',
' */\n',
'\n'
].join('');
diff --git a/index.php b/index.php
index b9544faa..4d907676 100755
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
* @author Bill Zimmerman
* @license GNU General Public License, version 3 (GPL-3.0)
* @version 2.6
- * @link https://github.com/billz/raspap/
+ * @link https://github.com/raspap/raspap-webgui/
* @link https://raspap.com/
* @see http://sirlagz.net/2013/02/08/raspap-webgui/
*
diff --git a/installers/common.sh b/installers/common.sh
index 30d66da6..6fe4c5ca 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -4,7 +4,7 @@
# Author: @billz
# Author URI: https://github.com/billz/
# License: GNU General Public License v3.0
-# License URI: https://github.com/billz/raspap/blob/master/LICENSE
+# License URI: https://github.com/raspap/raspap-webgui/blob/master/LICENSE
# You are not obligated to bundle the LICENSE file with your RaspAP projects as long
# as you leave these references intact in the header comments of your source files.
diff --git a/installers/raspbian.sh b/installers/raspbian.sh
index 815cfa8c..4b8011fd 100755
--- a/installers/raspbian.sh
+++ b/installers/raspbian.sh
@@ -4,7 +4,7 @@
# Author: @billz
# Author URI: https://github.com/billz/
# License: GNU General Public License v3.0
-# License URI: https://github.com/billz/raspap/blob/master/LICENSE
+# License URI: https://github.com/raspap/raspap-webgui/blob/master/LICENSE
#
# Usage: raspbian.sh options
#
@@ -15,7 +15,7 @@
# -c, --cert, --certficate Installs mkcert and generates an SSL certificate for lighttpd
# -o, --openvpn Used with -y, --yes, sets OpenVPN install option (0=no install)
# -a, --adblock Used with -y, --yes, sets Adblock install option (0=no install)
-# -r, --repo, --repository Overrides the default GitHub repo (billz/raspap-webgui)
+# -r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui)
# -b, --branch Overrides the default git branch (master)
# -h, --help Outputs usage notes and exits
# -u, --upgrade Upgrades an existing installation to the latest release version
@@ -24,9 +24,9 @@
# Depending on options passed to the installer, ONE of the following
# additional shell scripts will be downloaded and sourced:
#
-# https://raw.githubusercontent.com/billz/raspap/master/installers/common.sh
+# https://raw.githubusercontent.com/raspap/raspap-webgui/master/installers/common.sh
# - or -
-# https://raw.githubusercontent.com/billz/raspap/master/installers/mkcert.sh
+# https://raw.githubusercontent.com/raspap/raspap-webgui/master/installers/mkcert.sh
#
# You are not obligated to bundle the LICENSE file with your RaspAP projects as long
# as you leave these references intact in the header comments of your source files.
@@ -35,7 +35,7 @@ set -eo pipefail
function _main() {
# set defaults
- repo="billz/raspap" # override with -r, --repo option
+ repo="raspap/raspap-webgui" # override with -r, --repo option
_parse_params "$@"
_setup_colors
@@ -123,7 +123,7 @@ OPTIONS:
-c, --cert, --certificate Installs an SSL certificate for lighttpd
-o, --openvpn Used with -y, --yes, sets OpenVPN install option (0=no install)
-a, --adblock Used with -y, --yes, sets Adblock install option (0=no install)
--r, --repo, --repository Overrides the default GitHub repo (billz/raspap-webgui)
+-r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui)
-b, --branch Overrides the default git branch (latest release)
-u, --upgrade Upgrades an existing installation to the latest release version
-v, --version Outputs release info and exits
diff --git a/package.json b/package.json
index 61f81579..300e7fe2 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"start": "node_modules/.bin/gulp watch"
},
- "description": "Simple AP setup & WiFi management for Debian-based devices",
+ "description": "Simple wireless AP setup & management for Debian-based devices",
"keywords": [
"raspberry-pi",
"hostapd",
@@ -16,18 +16,19 @@
"admin",
"app"
],
- "homepage": "https://github.com/billz/raspap",
+ "homepage": "https://github.com/raspap/raspap-webgui",
"bugs": {
- "url": "https://github.com/billz/raspap/issues"
+ "url": "https://github.com/raspap/raspap-webgui/issues"
},
"license": "GPL-3.0",
"author": "RaspAP Developers",
"contributors": [
- "Bill Zimmerman (https://github.com/billz)"
+ "Bill Zimmerman (https://github.com/billz)",
+ "Lawrence Yau (https://github.com/SirLagz)"
],
"repository": {
"type": "git",
- "url": "https://github.com/billz/raspap.git"
+ "url": "https://github.com/raspap/raspap-webgui.git"
},
"publishConfig": {
"registry": "https://npm.pkg.github.com/"
diff --git a/templates/about/general.php b/templates/about/general.php
index f6274bf0..db16a9ef 100644
--- a/templates/about/general.php
+++ b/templates/about/general.php
@@ -5,17 +5,17 @@