diff --git a/BACKERS.md b/BACKERS.md index 16c6e2e7..6c51208d 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -1,39 +1,63 @@ -## Sponors +## Insiders -Development of RaspAP is made possible thanks to our awesome sponsors. If you use RaspAP in a commerical application, consider sponsoring the project at a commerical tier. There are several benefits for sponsors at this level. Find out more about [becoming a sponsor](https://github.com/sponsors/billz). +Development of RaspAP is made possible thanks to a sponsorware release model. This means that new features are first exclusively released to sponsors as part of [**Insiders**](https://github.com/sponsors/RaspAP). Read on to learn how sponsorship works, and how easy it is to get access to Insiders. -#### 💖 Benefactors +Untitled -#### 🏆 Gilded supporters +### How sponsorship works +New features first land in **Insiders**, which means that *sponsors will have access to them immediately*. Every feature is tied to a funding goal in monthly subscriptions. When a funding goal is hit, the features that are tied to it are merged back into the [public RaspAP repository](https://github.com/RaspAP/raspap-webgui) and released for general availability. Bugfixes and minor enhancements are always released simultaneously in both editions. -#### 🤖 Robot fuelers +Don't want to sponsor? No problem, RaspAP already has tons of features available, so chances are that most of your requirements are already satisfied. See the list of exclusive features to learn which features are currently only available to sponsors. -#### ☕ī¸ Coffee supporters +### How to become a sponsor +You can [become a sponsor](https://github.com/sponsors/RaspAP) using your individual or organization's GitHub account. Just pick any tier from $10/month and complete the checkout. Then, after a few hours, you will be added as a team member to the super-secret private GitHub repository containing the Insiders edition, which has all exclusive features. In addition, you get access to Insiders-only team discussions and content. -## Donors +> ℹī¸ **Important**: If you're sponsoring [RaspAP](https://github.com/RaspAP/sponsors) through a GitHub organization, please send a short email to [sponsors@raspap.com](mailto:sponsors@raspap.com) with the name of your organization and the account that should be added as a collaborator. -Recurring and one-time donors are vital to the continued development of this project. Join these awesome donors by pledging via [OpenCollective](https://opencollective.com/raspap) or [PayPal](https://paypal.me/billzgithub). +### Exclusive features +When backers were asked which feature they'd most like to see added to RaspAP, the ability to manage multiple OpenVPN client configurations topped the list of requests. We think this is a great idea, so we're adding this as the first feature exclusive to insiders. -## OpenCollective -Navisense GmbH - $500 -Wechaty - "RaspAP is awesome!" -$20 -Pheppy - $10 -Mark H - "I've used this project for some time, great in combi with a Sixfab LTE HAT." -$10 -Phil K - $10 -T.Paul L - $5 -Wouter D - $20 -Andy N - "This is a great solution with a very responsive lead. Thanks for all your hard work." -$20 -Paul B - $20 -Bert S - "I use RaspAP for IoT devices in combination with OpenVPN. Works like a charm." -â‚Ŧ25 +✅ Multiple OpenVPN client configs +✅ OpenVPN service logging +⚙ī¸ Traffic shaping (in progress) -## PayPal -Ray E - "This project is awesome and just works; saved me and my client tons of work. Thank you!" -$20 -Erin C - "Just got Raspap up and running, looks very cool, thanks!" -$20 CAD -Ralf J - "Thanks for RaspAP including OpenVPN. It was a big help for me." -â‚Ŧ15 -Felipe C - "Thanks for the good work on RaspAP!" -$6 -Webagentur S - "Like what you and RaspAP are doing." -â‚Ŧ20 -Matthew B - "Great project, easy to set up." -ÂŖ15 -Mikko M - "Thanks for the great RaspAP." -â‚Ŧ10 -Oren G - "Needed to create an AP with my pi, this just worked so well! Thank you!" -$25 -Vince H - "Such a great project! Thank you and keep up the great work!" -$20 +Look for the list above to grow as we add more exclusive features. + +### Funding targets +Below is a list of funding targets. When a funding target is reached, the features that are tied to it are merged back into RaspAP and released to the public for general availability. + +#### $500 +✅ Multiple OpenVPN client configs +✅ OpenVPN service logging +⚙ī¸ Traffic shaping (in progress) + +### Frequently asked questions + +#### Upgrading +*I have an existing RaspAP installation. How do I upgrade to Insiders?* + +Upgrading is easy. Simply invoke the [Quick Installer](https://docs.raspap.com/quick/) with the `--upgrade` switch, specifying the private Insiders repo, like so: + +``` +curl -sL https://install.raspap.com | bash -s -- --upgrade --repo raspap/raspap-insiders +``` + +If you haven't [added SSH keys to your GitHub account](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh) you will be prompted to authenticate. If so, just enter your GitHub credentials during the install: + +``` +RaspAP Install: Cloning latest files from github +Cloning into '/tmp/raspap-webgui'... +Username for 'https://github.com': octocat +Password for 'https://octocat@github.com': +``` + +> ℹī¸ **Note**: your password is sent securely via SSH to GitHub. The above prompt is actually from GitHub, so the installer does _not_ know your credentials. + +#### Terms +*We're using RaspAP for a commercial project. Can we use Insiders under the same terms and conditions?* + +Yes. Whether you're an individual or a company, you may use RaspAP Insiders precisely under the same terms as RaspAP, which are defined by the GNU GPL 3.0 license. However, we kindly ask you to respect the following guidelines: + +* Please **don't distribute the source code** of Insiders. You may freely use it for public, private or commercial projects, fork it, mirror it, do whatever you want with it, but please don't release the source code, as it would counteract the sponsorware strategy. +* If you cancel your subscription, you're removed as a collaborator and will miss out on future updates of Insiders. However, you may *use the latest version* that's available to you as long as you like. Just remember that [GitHub deletes private forks](https://docs.github.com/en/github/setting-up-and-managing-your-github-user-account/removing-a-collaborator-from-a-personal-repository). diff --git a/README.md b/README.md index 4b7a185c..0ee055e1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![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.org/RaspAP/raspap-webgui.svg) [![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.1](https://img.shields.io/badge/release-v2.6.1-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.org/RaspAP/raspap-webgui.svg) [![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. @@ -85,7 +85,7 @@ RaspAP lets you create an AP with a Wifi client configuration, often called [AP- **Note:** This option is disabled until you configure your system as a wireless client. For a device operating in [managed mode](https://docs.raspap.com/faq/#headless) without an `eth0` connection, this configuration must be enabled [_before_ a reboot](https://docs.raspap.com/ap-sta/). ## Support us -RaspAP is free software, but powered by your support. If you find RaspAP useful for your personal or commercial projects, [become a GitHub sponsor](https://github.com/sponsors/RaspAP/) or join the project on [Open Collective](https://opencollective.com/RaspAP). Either of these options makes a big difference! +RaspAP is free software, but powered by your support. If you find RaspAP useful for your personal or commercial projects, [become a GitHub sponsor](https://github.com/sponsors/RaspAP/) and get access to exclusive features in the [Insiders Edition](https://github.com/sponsors/RaspAP/). ## Manual installation Detailed manual setup instructions are provided [on our documentation site](https://docs.raspap.com/manual/). @@ -151,25 +151,11 @@ This project exists thanks to all the awesome people who [contribute](CONTRIBUTI ### Financial Contributors -Become a [financial contributor](https://opencollective.com/raspap/contribute) and help us sustain our community. +Development of RaspAP is made possible thanks to a sponsorware release model. This means that new features are first exclusively released to sponsors as part of [**Insiders**](https://github.com/sponsors/RaspAP). -#### Individuals - +[![](https://i.imgur.com/azMTmuP.png)](https://github.com/sponsors/RaspAP/) -#### Organizations - -[Support this project](https://opencollective.com/raspap/contribute) with your organization. Your logo will show up here with a link to your website. - - - - - - - - - - - +Learn more about [how sponsorship works](https://github.com/sponsors/RaspAP), and how easy it is to get access to Insiders. ## License See the [LICENSE](./LICENSE) file. diff --git a/includes/defaults.php b/includes/defaults.php index 093f66ac..89fdb759 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -6,7 +6,7 @@ if (!defined('RASPI_CONFIG')) { $defaults = [ 'RASPI_BRAND_TEXT' => 'RaspAP', - 'RASPI_VERSION' => '2.6', + 'RASPI_VERSION' => '2.6.1', 'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0', diff --git a/index.php b/index.php index 4d907676..d0884831 100755 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.6 + * @version 2.6.1 * @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 9f9c9d87..cf3883e1 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -572,9 +572,8 @@ function _optimize_php() { function _install_complete() { _install_log "Installation completed" - echo "This project needs your help! Please consider supporting RaspAP on Open Collective or GitHub:" + echo "Join RaspAP Insiders for access to exclusive features:" echo -e "${ANSI_RASPBERRY}" - echo "> https://opencollective.com/RaspAP" echo "> https://github.com/sponsors/RaspAP" echo -e "${ANSI_RESET}" if [ "$assume_yes" == 0 ]; then