From 72515b0734b6977bca0745a74af5874a2c79c8e8 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 10 Feb 2021 16:23:56 +0000 Subject: [PATCH] Update release version --- README.md | 30 +++++++++++++++++++++++++++--- includes/defaults.php | 2 +- index.php | 4 ++-- installers/common.sh | 3 +-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0eded8f9..c3b0fa5c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/DpgvLIO.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.7](https://img.shields.io/badge/release-v2.7-green)](https://github.com/raspap/raspap-insiders/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/) Welcome to **RaspAP Insiders**. You, the members of the Insiders community, support the sponsorware release model, which means that new features are first exclusively released to sponsors as part of Insiders. Read on for details about how this strategy works—and *thank you* for joining us on this journey. @@ -27,7 +27,9 @@ As part of the initial rollout of Insiders, all previous one-time backers of Ras ## 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. Therefore, we're adding this as the first feature exclusive to insiders. - ✅ Manage OpenVPN client configs +✅ Manage OpenVPN client configs +✅ OpenVPN service logging +⚙️ Traffic shaping (in progress) Look for the list above to grow as we add more exlcusive features. Have an idea or suggestion for a future enhancement? Start or join an [Insiders discussion](https://github.com/orgs/RaspAP/teams/insiders/discussions) and let us know! @@ -35,10 +37,32 @@ Look for the list above to grow as we add more exlcusive features. Have an idea Following 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 -✅ Manage OpenVPN client configs +✅ Manage 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 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?* diff --git a/includes/defaults.php b/includes/defaults.php index 093f66ac..93aa2df3 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.7', '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..805ef863 100755 --- a/index.php +++ b/index.php @@ -14,8 +14,8 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.6 - * @link https://github.com/raspap/raspap-webgui/ + * @version 2.7 + * @link https://github.com/raspap/raspap-insiders/ * @link https://raspap.com/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/ * diff --git a/installers/common.sh b/installers/common.sh index 7edad9c6..fc7fea58 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -573,9 +573,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