From 0f0c73de0f98f39557e842a436efb78ef88674a6 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Mon, 8 Mar 2021 09:08:59 +0100 Subject: [PATCH 01/24] Update BACKERS.md --- BACKERS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index 8ea2c184..fda9b737 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -21,6 +21,7 @@ When backers were asked which feature they'd most like to see added to RaspAP, t ✅ OpenVPN service logging ✅ Night mode toggle ✅ Restrict network to static clients +✅ WireGuard support ⚙️ Traffic shaping (in progress) Look for the list above to grow as we add more exclusive features. @@ -33,6 +34,7 @@ Below is a list of funding targets. When a funding target is reached, the featur ✅ OpenVPN service logging ✅ Night mode toggle ✅ Restrict network to static clients +✅ WireGuard support ⚙️ Traffic shaping (in progress) ### Frequently asked questions From c62d99aab9d29cf1b3b7951f8cc34a54a7d65ffd Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 9 Mar 2021 11:38:40 +0000 Subject: [PATCH 02/24] Adds @zbchristian's token option, fix private repo handling --- installers/common.sh | 60 +++++++++++++++++++++++++++++++++++++++--- installers/raspbian.sh | 36 ++++++++++++++++--------- 2 files changed, 80 insertions(+), 16 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index dba8a0b9..8b532be3 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -28,7 +28,12 @@ readonly raspap_network="$raspap_dir/networking/" readonly rulesv4="/etc/iptables/rules.v4" readonly notracking_url="https://raw.githubusercontent.com/notracking/hosts-blocklists/master/" webroot_dir="/var/www/html" -git_source_url="https://github.com/$repo" # $repo from install.raspap.com + +if [ "$insiders" == 1 ]; then + repo="RaspAP/raspap-insiders" + branch=${RASPAP_INSIDERS_LATEST} +fi +git_source_url="https://github.com/$repo" # NOTE: all the below functions are overloadable for system-specific installs function _install_raspap() { @@ -50,6 +55,7 @@ function _install_raspap() { _configure_networking _prompt_install_adblock _prompt_install_openvpn + _prompt_install_wireguard _patch_system_files _install_complete } @@ -77,7 +83,7 @@ function _config_installation() { fi echo "${opt[1]} lighttpd directory: ${webroot_dir}" if [ "$upgrade" == 1 ]; then - echo "This will upgrade your existing install to version ${RASPAP_LATEST}" + echo "This will upgrade your existing install to version ${RASPAP_RELEASE}" echo "Your configuration will NOT be changed" fi echo -n "Complete ${opt[2]} with these values? [Y/n]: " @@ -170,6 +176,8 @@ function _create_raspap_directories() { # Create a directory to store networking configs echo "Creating $raspap_dir/networking" sudo mkdir -p "$raspap_dir/networking" + echo "Changing file ownership of $raspap_dir" + sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || _install_status 1 "Unable to change file ownership for '$raspap_dir'" } # Generate hostapd logging and service control scripts @@ -313,6 +321,49 @@ function _prompt_install_openvpn() { fi } +# Prompt to install WireGuard +function _prompt_install_wireguard() { + if [ "$insiders" == 1 ]; then + _install_log "Configure WireGuard support" + echo -n "Install WireGuard and enable VPN tunnel configuration? [Y/n]: " + if [ "$assume_yes" == 0 ]; then + read answer < /dev/tty + if [ "$answer" != "${answer#[Nn]}" ]; then + echo -e + else + _install_wireguard + fi + elif [ "$wg_option" == 1 ]; then + _install_wireguard + else + echo "(Skipped)" + fi + fi +} + +# Install Wireguard from the Debian unstable distro +function _install_wireguard() { + _install_log "Configure WireGuard support" + if [ "$OS" == "Raspbian" ]; then + echo "Installing raspberrypi-kernel-headers" + sudo apt-get install $apt_option raspberrypi-kernel-headers || _install_status 1 "Unable to install raspberrypi-kernel-headers" + fi + echo "Installing WireGuard from Debian unstable distro" + echo "Adding Debian distro" + echo "deb http://deb.debian.org/debian/ unstable main" | sudo tee --append /etc/apt/sources.list.d/unstable.list || _install_status 1 "Unable to append to sources.list" + sudo apt-get install dirmngr || _install_status 1 "Unable to install dirmngr" + echo "Adding Debian distro keys" + sudo wget -q -O - https://ftp-master.debian.org/keys/archive-key-$(lsb_release -sr).asc | sudo apt-key add - || _install_status 1 "Unable to add keys" + printf 'Package: *\nPin: release a=unstable\nPin-Priority: 150\n' | sudo tee --append /etc/apt/preferences.d/limit-unstable || _install_status 1 "Unable to append to preferences.d" + echo "Installing WireGuard" + sudo apt-get update && sudo apt-get install $apt_option wireguard || _install_status 1 "Unable to install wireguard" + echo "Enabling wg-quick@wg0" + sudo systemctl enable wg-quick@wg0 || _install_status 1 "Failed to enable wg-quick service" + echo "Enabling WireGuard management option" + sudo sed -i "s/\('RASPI_WIREGUARD_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" + _install_status 0 +} + # Install openvpn and enable client configuration option function _install_openvpn() { _install_log "Installing OpenVPN and enabling client configuration" @@ -329,9 +380,10 @@ function _create_openvpn_scripts() { _install_log "Creating OpenVPN control scripts" sudo mkdir $raspap_dir/openvpn || _install_status 1 "Unable to create directory '$raspap_dir/openvpn'" - # Move service auth control shell scripts + # Move service auth control & logging shell scripts sudo cp "$webroot_dir/installers/"configauth.sh "$raspap_dir/openvpn" || _install_status 1 "Unable to move auth control script" - # Make configauth.sh writable by www-data group + sudo cp "$webroot_dir/installers/"openvpnlog.sh "$raspap_dir/openvpn" || _install_status 1 "Unable to move logging script" + # Make scripts executable by www-data group sudo chown -c root:"$raspap_user" "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable change owner and/or group" sudo chmod 750 "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable to change file permissions" _install_status 0 diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 469fff7f..fed9b619 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -17,6 +17,7 @@ # -a, --adblock Used with -y, --yes, sets Adblock install option (0=no install) # -r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui) # -b, --branch Overrides the default git branch (master) +# -t, --token Token to access a private repository # -u, --upgrade Upgrades an existing installation to the latest release version # -i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) # -v, --version Outputs release info and exits @@ -36,8 +37,7 @@ set -eo pipefail function _main() { # set defaults - repo="raspap/raspap-webgui" # override with -r, --repo option - + repo="RaspAP/raspap-webgui" # override with -r, --repo option _parse_params "$@" _setup_colors _log_output @@ -50,6 +50,8 @@ function _parse_params() { upgrade=0 ovpn_option=1 adblock_option=1 + insiders=0 + acctoken="" while :; do case "${1-}" in @@ -83,7 +85,10 @@ function _parse_params() { upgrade=1 ;; -i|--insiders) - repo="raspap/raspap-insiders" + insiders=1 + ;; + -t|--token) + acctoken="$2" ;; -v|--version) _version @@ -129,6 +134,7 @@ OPTIONS: -a, --adblock Used with -y, --yes, sets Adblock install option (0=no install) -r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui) -b, --branch Overrides the default git branch (latest release) +-t, --token Token to access a private repository -u, --upgrade Upgrades an existing installation to the latest release version -i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) -v, --version Outputs release info and exits @@ -153,7 +159,7 @@ EOF function _version() { _get_release - echo -e "RaspAP v${RASPAP_LATEST} - Simple wireless AP setup & management for Debian-based devices" + echo -e "RaspAP v${RASPAP_RELEASE} - Simple wireless AP setup & management for Debian-based devices" exit } @@ -167,18 +173,19 @@ function _display_welcome() { echo -e " 88 88 88. .88 88 88. .88 88 88 88" echo -e " dP dP 88888P8 88888P 88Y888P 88 88 dP" echo -e " 88" - echo -e " dP version ${RASPAP_LATEST}" + echo -e " dP version ${RASPAP_RELEASE}" echo -e "${ANSI_GREEN}" echo -e "The Quick Installer will guide you through a few easy steps${ANSI_RESET}\n\n" } -# Fetch latest release from GitHub API +# Fetch latest release from GitHub or RaspAP Installer API function _get_release() { - if [ "$repo" == "raspap/raspap-insiders" ]; then - readonly RASPAP_LATEST="Insiders" - branch="master" + readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) + if [ "$insiders" == 1 ]; then + RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) + RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else - readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) + RASPAP_RELEASE="${RASPAP_LATEST}" fi } @@ -214,6 +221,7 @@ function _update_system_packages() { # Fetch required installer functions function _load_installer() { + # fetch latest release tag _get_release @@ -223,14 +231,18 @@ function _load_installer() { fi UPDATE_URL="https://raw.githubusercontent.com/$repo/$branch/" + header=() + if [[ ! -z "$acctoken" ]]; then + header=(--header "Authorization: token $acctoken") + fi if [ "${install_cert:-}" = 1 ]; then source="mkcert" - wget -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh + wget "${header[@]}" -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh source /tmp/raspap_${source}.sh && rm -f /tmp/raspap_${source}.sh _install_certificate || _install_status 1 "Unable to install certificate" else source="common" - wget -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh + wget "${header[@]}" -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh source /tmp/raspap_${source}.sh && rm -f /tmp/raspap_${source}.sh _install_raspap || _install_status 1 "Unable to install RaspAP" fi From 45965c4ae0d5954eeca0a6dee6c1ee7fe27a9404 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 9 Mar 2021 11:43:22 +0000 Subject: [PATCH 03/24] Add openvpnlog.sh --- installers/openvpnlog.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 installers/openvpnlog.sh diff --git a/installers/openvpnlog.sh b/installers/openvpnlog.sh new file mode 100755 index 00000000..96e79e2d --- /dev/null +++ b/installers/openvpnlog.sh @@ -0,0 +1,3 @@ +#!/bin/bash +touch /tmp/openvpn.log +grep -m 100 openvpn /var/log/syslog | sudo tee /tmp/openvpn.log From 13997d57a98122a8abcc83400b6c8d4fb4b276f1 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 9 Mar 2021 12:12:11 +0000 Subject: [PATCH 04/24] Minor: cleanup + comments --- installers/raspbian.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index fed9b619..ab1dabf9 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -221,7 +221,6 @@ function _update_system_packages() { # Fetch required installer functions function _load_installer() { - # fetch latest release tag _get_release @@ -230,11 +229,13 @@ function _load_installer() { branch=$RASPAP_LATEST fi - UPDATE_URL="https://raw.githubusercontent.com/$repo/$branch/" + # add optional auth token header if defined with -t, --token option header=() if [[ ! -z "$acctoken" ]]; then header=(--header "Authorization: token $acctoken") fi + + UPDATE_URL="https://raw.githubusercontent.com/$repo/$branch/" if [ "${install_cert:-}" = 1 ]; then source="mkcert" wget "${header[@]}" -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh From 113ffa2d800163c16fd1106342d1af21651d82a1 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 9 Mar 2021 12:21:34 +0000 Subject: [PATCH 05/24] Minor: comments + whitespace --- installers/raspbian.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index ab1dabf9..f0e2eb4a 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -17,7 +17,7 @@ # -a, --adblock Used with -y, --yes, sets Adblock install option (0=no install) # -r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui) # -b, --branch Overrides the default git branch (master) -# -t, --token Token to access a private repository +# -t, --token Specify a GitHub token to access a private repository # -u, --upgrade Upgrades an existing installation to the latest release version # -i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) # -v, --version Outputs release info and exits @@ -134,7 +134,7 @@ OPTIONS: -a, --adblock Used with -y, --yes, sets Adblock install option (0=no install) -r, --repo, --repository Overrides the default GitHub repo (raspap/raspap-webgui) -b, --branch Overrides the default git branch (latest release) --t, --token Token to access a private repository +-t, --token Specify a GitHub token to access a private repository -u, --upgrade Upgrades an existing installation to the latest release version -i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) -v, --version Outputs release info and exits @@ -243,7 +243,7 @@ function _load_installer() { _install_certificate || _install_status 1 "Unable to install certificate" else source="common" - wget "${header[@]}" -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh + wget "${header[@]}" -q ${UPDATE_URL}installers/${source}.sh -O /tmp/raspap_${source}.sh source /tmp/raspap_${source}.sh && rm -f /tmp/raspap_${source}.sh _install_raspap || _install_status 1 "Unable to install RaspAP" fi From dd46f6d4832d1c161fcdda50633fbd6216bc35bb Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 9 Mar 2021 13:26:30 +0000 Subject: [PATCH 06/24] Update release version --- README.md | 2 +- includes/defaults.php | 2 +- index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4ceebd7a..7386f445 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![Release 2.6.2](https://img.shields.io/badge/release-v2.6.2-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.3](https://img.shields.io/badge/release-v2.6.3-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. diff --git a/includes/defaults.php b/includes/defaults.php index dfdb7ccb..81803f14 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.2', + 'RASPI_VERSION' => '2.6.3', '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 b69f89b9..3b7a78dd 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.2 + * @version 2.6.3 * @link https://github.com/raspap/raspap-webgui/ * @link https://raspap.com/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/ From 860a5d21d8c77aae358c0382fc045926dd9d038a Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Tue, 9 Mar 2021 23:27:24 +0100 Subject: [PATCH 07/24] Update README.md --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7386f445..8ae3d81d 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use - [Prerequisites](#prerequisites) - [Quick installer](#quick-installer) + - [WireGuard support](#wireguard-support) - [Ad Blocking](#ad-blocking) - [Bridged AP](#bridged-ap) - [Simultaneous AP and Wifi client](#simultaneous-ap-and-wifi-client) @@ -65,6 +66,16 @@ configured as an access point as follows: Please [read this](https://docs.raspap.com/issues/) before reporting an issue. +## WireGuard support + +![](https://i.imgur.com/5YDv37e.png) + +WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be considerably more performant than OpenVPN, and is generally regarded as the most secure, easiest to use, and simplest VPN solution for modern Linux distributions. + +WireGuard may be optionally installed by the [Quick Installer](https://docs.raspap.com/quick/). Once this is done, you can manage local (server) settings, create a peer configuration and control the `wg-quick` service with RaspAP. + +Details are [provided here](https://docs.raspap.com/wireguard/). + ## Ad Blocking This feature uses DNS blacklisting to block requests for ads, trackers and other undesirable hosts. To enable ad blocking, simply respond to the prompt during the installation. As a beta release, we encourage testing and feedback from users of RaspAP. @@ -73,8 +84,6 @@ Details are [provided here](https://docs.raspap.com/adblock/). ## Bridged AP By default RaspAP configures a routed AP for your clients to connect to. A bridged AP configuration is also possible. Slide the **Bridged AP mode** toggle under the **Advanced** tab of **Configure hotspot**, then save and restart the hotspot. -![](https://i.imgur.com/J5VKSay.png) - **Note:** In bridged mode, all routing capabilities are handled by your upstream router. Because your router assigns IP addresses to your device's hotspot and its clients, you might not be able to reach the RaspAP web interface from the default `10.3.141.1` address. Instead use your RPi's hostname followed by `.local` to access the RaspAP web interface. With Raspbian default settings, this should look like `raspberrypi.local`. Alternate methods are [discussed here](https://www.raspberrypi.org/documentation/remote-access/ip-address.md). More information on Bridged AP mode is provided [in our documentation](https://docs.raspap.com/bridged/). @@ -85,7 +94,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/) and get access to exclusive features in the [Insiders Edition](https://github.com/sponsors/RaspAP/). +RaspAP is free software, but powered by _your_ support. If you find RaspAP useful for your personal or commercial projects, [become an Insider](https://github.com/sponsors/RaspAP/) and get early access to exclusive features in the [Insiders Edition](https://docs.raspap.com/insiders/). ## Manual installation Detailed manual setup instructions are provided [on our documentation site](https://docs.raspap.com/manual/). @@ -155,7 +164,7 @@ Development of RaspAP is made possible thanks to a sponsorware release model. Th [![](https://i.imgur.com/azMTmuP.png)](https://github.com/sponsors/RaspAP/) -Learn more about [how sponsorship works](https://github.com/sponsors/RaspAP), and how easy it is to get access to Insiders. +Learn more about [how sponsorship works](https://docs.raspap.com/insiders/#how-sponsorship-works), and how easy it is to get access to Insiders. ## License See the [LICENSE](./LICENSE) file. From f905434b0b6494c41dbd2e46cebe3f2699554b64 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 10 Mar 2021 06:27:29 +0000 Subject: [PATCH 08/24] Minor: comments + get_release() --- installers/common.sh | 5 +++-- installers/raspbian.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 8b532be3..986822d3 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -640,9 +640,10 @@ function _optimize_php() { function _install_complete() { _install_log "Installation completed" - echo "Join RaspAP Insiders for access to exclusive features:" + echo "Join RaspAP Insiders for early access to exclusive features!" echo -e "${ANSI_RASPBERRY}" - echo "> https://github.com/sponsors/RaspAP" + echo "> https://docs.raspap.com/insiders/" + echo "> https://github.com/sponsors/RaspAP/" echo -e "${ANSI_RESET}" if [ "$assume_yes" == 0 ]; then # Prompt to reboot if wired ethernet (eth0) is connected. diff --git a/installers/raspbian.sh b/installers/raspbian.sh index f0e2eb4a..031f6d56 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -15,11 +15,11 @@ # -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 (raspap/raspap-webgui) +# -r, --repo, --repository Overrides the default GitHub repo (RaspAP/raspap-webgui) # -b, --branch Overrides the default git branch (master) # -t, --token Specify a GitHub token to access a private repository # -u, --upgrade Upgrades an existing installation to the latest release version -# -i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) +# -i, --insiders Installs from the Insiders Edition (RaspAP/raspap-insiders) # -v, --version Outputs release info and exits # -h, --help Outputs usage notes and exits # @@ -45,7 +45,7 @@ function _main() { } function _parse_params() { - # default flag values + # default option values assume_yes=0 upgrade=0 ovpn_option=1 @@ -132,11 +132,11 @@ 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 (raspap/raspap-webgui) +-r, --repo, --repository Overrides the default GitHub repo (RaspAP/raspap-webgui) -b, --branch Overrides the default git branch (latest release) -t, --token Specify a GitHub token to access a private repository -u, --upgrade Upgrades an existing installation to the latest release version --i, --insiders Installs from the Insiders Edition (raspap/raspap-insiders) +-i, --insiders Installs from the Insiders Edition (RaspAP/raspap-insiders) -v, --version Outputs release info and exits -h, --help Outputs usage notes and exits @@ -173,19 +173,19 @@ function _display_welcome() { echo -e " 88 88 88. .88 88 88. .88 88 88 88" echo -e " dP dP 88888P8 88888P 88Y888P 88 88 dP" echo -e " 88" - echo -e " dP version ${RASPAP_RELEASE}" + echo -e " dP version ${RASPAP_RELEASE}" echo -e "${ANSI_GREEN}" echo -e "The Quick Installer will guide you through a few easy steps${ANSI_RESET}\n\n" } # Fetch latest release from GitHub or RaspAP Installer API function _get_release() { - readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) if [ "$insiders" == 1 ]; then - RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) - RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" + readonly RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) + readonly RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else - RASPAP_RELEASE="${RASPAP_LATEST}" + readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) + readonly RASPAP_RELEASE="${RASPAP_LATEST}" fi } From 4777da48e6f19e4e60fa21dd01345422b302004d Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 10 Mar 2021 06:29:11 +0000 Subject: [PATCH 09/24] Update get_release() --- installers/raspbian.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 031f6d56..e61be385 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -181,11 +181,11 @@ function _display_welcome() { # Fetch latest release from GitHub or RaspAP Installer API function _get_release() { if [ "$insiders" == 1 ]; then - readonly RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) - readonly RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" + RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) + RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else - readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) - readonly RASPAP_RELEASE="${RASPAP_LATEST}" + RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) + RASPAP_RELEASE="${RASPAP_LATEST}" fi } From b6e308351fa0e19e869dd540e6823f83ed38d22a Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 10 Mar 2021 06:37:12 +0000 Subject: [PATCH 10/24] Update get_release() --- installers/raspbian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index e61be385..63a43a11 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -180,11 +180,11 @@ function _display_welcome() { # Fetch latest release from GitHub or RaspAP Installer API function _get_release() { + RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) if [ "$insiders" == 1 ]; then RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else - RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) RASPAP_RELEASE="${RASPAP_LATEST}" fi } From 18bcc3032a683d0a34c6257412fc212c261872aa Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Thu, 11 Mar 2021 11:32:48 +0100 Subject: [PATCH 11/24] Update README.md --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8ae3d81d..b912008c 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use - [Prerequisites](#prerequisites) - [Quick installer](#quick-installer) - [WireGuard support](#wireguard-support) + - [OpenVPN support](#openvpn-support) - [Ad Blocking](#ad-blocking) - [Bridged AP](#bridged-ap) - [Simultaneous AP and Wifi client](#simultaneous-ap-and-wifi-client) @@ -26,7 +27,6 @@ We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use - [Supported operating systems](#supported-operating-systems) - [Multilingual support](#multilingual-support) - [HTTPS support](#https-support) - - [OpenVPN support](#openvpn-support) - [How to contribute](#how-to-contribute) - [Reporting issues](#reporting-issues) - [License](#license) @@ -76,6 +76,14 @@ WireGuard may be optionally installed by the [Quick Installer](https://docs.rasp Details are [provided here](https://docs.raspap.com/wireguard/). +## OpenVPN support +OpenVPN may be optionally installed by the Quick Installer. Once this is done, you can [manage client configurations](https://docs.raspap.com/openvpn/) and the `openvpn-client` service with RaspAP. + +To configure an OpenVPN client, upload a valid .ovpn file and, optionally, specify your login credentials. RaspAP will store your client configuration and add firewall rules to forward traffic from OpenVPN's `tun0` interface to your configured wireless interface. + +See our [OpenVPN documentation](https://docs.raspap.com/openvpn/) for more information. + + ## Ad Blocking This feature uses DNS blacklisting to block requests for ads, trackers and other undesirable hosts. To enable ad blocking, simply respond to the prompt during the installation. As a beta release, we encourage testing and feedback from users of RaspAP. @@ -134,13 +142,6 @@ curl -sL https://install.raspap.com | bash -s -- --cert More information on SSL certificates and HTTPS support is available [in our documentation](https://docs.raspap.com/ssl-quick/). -## OpenVPN support -OpenVPN may be optionally installed by the Quick Installer. Once this is done, you can manage client configuration and the `openvpn-client` service with RaspAP. - -To configure an OpenVPN client, upload a valid .ovpn file and, optionally, specify your login credentials. RaspAP will store your client configuration and add firewall rules to forward traffic from OpenVPN's `tun0` interface to your configured wireless interface. - -**Note**: this feature is currently in beta. Please [read this](https://docs.raspap.com/faq/#openvpn-fails) before reporting an issue. - ## How to contribute 1. Fork the project in your account and create a new branch: `your-great-feature`. 2. Open an issue in the repository describing the feature contribution you'd like to make. From 3e5ac1e2672cc8f78637abf69377b0b26ce68875 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Thu, 11 Mar 2021 13:00:59 +0100 Subject: [PATCH 12/24] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b912008c..f08be583 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,9 @@ WireGuard may be optionally installed by the [Quick Installer](https://docs.rasp Details are [provided here](https://docs.raspap.com/wireguard/). ## OpenVPN support + +![](https://i.imgur.com/ta7tCon.png) + OpenVPN may be optionally installed by the Quick Installer. Once this is done, you can [manage client configurations](https://docs.raspap.com/openvpn/) and the `openvpn-client` service with RaspAP. To configure an OpenVPN client, upload a valid .ovpn file and, optionally, specify your login credentials. RaspAP will store your client configuration and add firewall rules to forward traffic from OpenVPN's `tun0` interface to your configured wireless interface. From 3a3f577a996cf32021556bc1e203274878de93a8 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 14 Mar 2021 17:03:11 +0000 Subject: [PATCH 13/24] Fix for -t,--token option --- installers/raspbian.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 63a43a11..e76adbe0 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -89,6 +89,7 @@ function _parse_params() { ;; -t|--token) acctoken="$2" + shift ;; -v|--version) _version From af1fab30ed367cfa6eefd20f88226bb88f8f7524 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Mon, 15 Mar 2021 16:48:51 +0100 Subject: [PATCH 14/24] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 66 +++++++++++++++------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a2fbbfc2..b76d8f30 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,43 +7,49 @@ assignees: '' --- -**Before submitting an issue** + + + -**Your environment** -* Raspberry Pi hardware (examples: Pi 3 Model B+, Pi Zero W) -* Raspbian version (examples: RPi OS Lite, Armbian) -* RaspAP version (reported by the Quick Installer) -* Followed the project prerequisites? (Y/N) -* Checked the project FAQ? (Y/N) -* RaspAP Quick Install or Manual setup? -* Using default configuration? (Y/N) -* Simultaneous AP and managed mode? (Y/N) -* Onboard wireless chipset or external adapter? -* Other software or services running with RaspAP? +## Checklist + +- [ ] This is a bug report +- [ ] I have searched this repository for existing issues and pull requests +- [ ] I checked the FAQ and official documentation before creating this issue +- [ ] I have read and understand the issue reporting guidelines -**Steps to reproduce** -Tell us how to reproduce this issue. Provide as much detailed information as possible. +## Bug description + -**Expected behavior** -A clear and concise description of what you expected to happen. +## Your environment +1. Operating System: **ENTER HERE** +2. Hardware and version: +3. RaspAP version (reported by the Quick Installer or About page): +4. Followed the project prerequisites? +5. RaspAP Quick Install or Manual setup? +6. Using default configuration? +7. Simultaneous AP and managed mode? +8. Onboard wireless chipset or external adapter? +9. Other software or services running with RaspAP? -**Actual behavior** -Tell us what you observed instead. +## Steps to Reproduce + -**Screenshots** -If applicable, add screenshots to help explain your problem. +## Screenshots + -**Additional context** -Add any other context about the problem here. +## Additional context + From 04376dd3a1483c3ca7a728089296045e3b03b647 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Mon, 15 Mar 2021 16:52:30 +0100 Subject: [PATCH 15/24] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b76d8f30..9379209c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -20,14 +20,14 @@ https://docs.raspap.com/faq/ Do you have a question or want to suggest a new feature? Start a Discussion here: https://github.com/RaspAP/raspap-docker/discussions -Be sure that there are no issues similar to yours already open. You can check this by searching the issues this repository. If there is a duplicate issue, please close this one and add a comment to the existing issue instead. +Be sure there are no issues similar to yours that are already open. You can check this by searching the issues in this repository. If there is a duplicate issue, please close this one and add a comment to the existing issue instead. --> ## Checklist - [ ] This is a bug report -- [ ] I have searched this repository for existing issues and pull requests +- [ ] I have searched this repository for existing issues - [ ] I checked the FAQ and official documentation before creating this issue - [ ] I have read and understand the issue reporting guidelines From b467e5b324b58d6ac8ce1ea7e8861d9c085e930b Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Mon, 15 Mar 2021 16:55:14 +0100 Subject: [PATCH 16/24] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9379209c..6c8e00f2 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -18,7 +18,7 @@ Refer to the frequently asked questions (FAQ) and official documentation here: https://docs.raspap.com/faq/ Do you have a question or want to suggest a new feature? Start a Discussion here: -https://github.com/RaspAP/raspap-docker/discussions +https://github.com/RaspAP/raspap-webgui/discussions Be sure there are no issues similar to yours that are already open. You can check this by searching the issues in this repository. If there is a duplicate issue, please close this one and add a comment to the existing issue instead. --> @@ -37,7 +37,7 @@ Be sure there are no issues similar to yours that are already open. You can chec ## Your environment 1. Operating System: **ENTER HERE** 2. Hardware and version: -3. RaspAP version (reported by the Quick Installer or About page): +3. RaspAP version: 4. Followed the project prerequisites? 5. RaspAP Quick Install or Manual setup? 6. Using default configuration? @@ -45,7 +45,7 @@ Be sure there are no issues similar to yours that are already open. You can chec 8. Onboard wireless chipset or external adapter? 9. Other software or services running with RaspAP? -## Steps to Reproduce +## Steps to reproduce ## Screenshots From 728a875eed3c55e815a60e3a2ece6c56fe588db9 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Thu, 18 Mar 2021 14:50:34 +0100 Subject: [PATCH 17/24] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 0949dd03..00000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -raspap.com \ No newline at end of file From bac9eaaeae3940aa6eae42d9208caf4125fc2347 Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Sat, 20 Mar 2021 10:31:05 +0100 Subject: [PATCH 18/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f08be583..89004fb8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](https://i.imgur.com/xeKD93p.png) +![](https://i.imgur.com/uhBFoOB.png) [![Release 2.6.3](https://img.shields.io/badge/release-v2.6.3-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. From fbe1688b2aed4c9968a12e56c34801bbb4ec08bb Mon Sep 17 00:00:00 2001 From: Bill Zimmerman Date: Sat, 20 Mar 2021 10:33:51 +0100 Subject: [PATCH 19/24] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89004fb8..b7e79b3a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](https://i.imgur.com/uhBFoOB.png) +![](https://i.imgur.com/xeKD93p.png) [![Release 2.6.3](https://img.shields.io/badge/release-v2.6.3-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. @@ -7,7 +7,7 @@ RaspAP has been featured on sites such as [Instructables](http://www.instructabl 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/uhBFoOB.png) ![](https://i.imgur.com/EiIpdOS.gif) ![](https://i.imgur.com/eCjUS1H.gif) ![](https://i.imgur.com/5FT2BcS.gif) From 9d00d503137544b5568215903db7270fda5634c1 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 20 Mar 2021 14:57:20 +0000 Subject: [PATCH 20/24] Update it_IT locale, thx Ioma Taani --- locale/it_IT/LC_MESSAGES/messages.mo | Bin 18771 -> 23425 bytes locale/it_IT/LC_MESSAGES/messages.po | 136 ++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo index b5846ff2943291add9219750e361d479886eea0c..b894df8cefc28249c15f80a7f87b6f693a892c6b 100644 GIT binary patch delta 9693 zcmbuE2YemHwTJh*%S|rWmTb#jTP|{uEZZ35g0XDN1sCK>HD-0Sme#(ySH4BE9Ly!A zhL*rW0;cx>p(@}PFwJyAOK7GO+T+ne=p-b(@4q|O5|HG*-+S}(x!;+Y-I+7zoS9j{ zGiOJBx-*h}tzV~eElO#`vWCJF@+|8t^bh-~)w0S9Evp1hhH-c}>eeM4ZZ^h z!H?lm*k!O~9Sm1N4Rr_5iF|5Ir= zn+Ed6dI*k&Z$P=O%Lv>E^Wk_{0_CYyP_EwyW%xG88mtGP-h0c`KZG{*9wS4KOoR&U zY$%Vd9hnVR>eA4QhRtv?%t9+-S+~Fp>aE2HEE#24hrpNN3^)~Q*TXnG6g~+n;Mg%C zkA`yn`B0v?3@S9YKzaWDEQ&0D7Ru$HL0R}6)Jg}9wJf}5l|enX9Cm>XP%clyPViW$ z=Z`n-J52pbC{Nu9<(Vg;4PSs=VfJej4X917n01AUaS>GVlo(Ef*ksLxGRQOhnc=li zo_o~P{|4D%){t?b;rm0PVXcKSd<$g0thF6Qu{aMZ*{*?F$u1~YJp<*scVK_`1?&d% zNC@Vz`awl&Cd`9JLG{-|jk6hQoKs+TxC3e-SHYgz|Bs`{(idTO_ytsKtO?;dN*E{96q!=c_!oAxY}XHSE2_1RDc?SOjj7TA;dtz9TOfF6ai{B5WgK7zrD zp*)kvrWJ?5z!0dUoeO)yYN&;*gZ#5v_|Z65Lrr`mR4zOSwVn6CtSos2MM?CZP%Hfq zYNBsp57@Uf>@R{ca3r+h1gHU*LalT?)OZ`94BQOm$>X35ISY1%=bQdZO7Xv5ypaa2 z^fsvaqo)2eltFJBes0=3m4yZsK;=LY>;)IVS#UL!p=UwGeuwG*4J3W6J52lAW%$20 z4PVkA3p-B=SJVq?B{q}+6QDda6Do`6Kuu5sd%{gn6K#Pq%T4>OhWA2w z_Q@=YR{j#y3m-!b^flB#-OEEm3ZNz`hMKq>%JAu?eUafBD8p-@CTM`%M^=mBFQFFN z3gzkSohXXoZm9kL98@-cVA?xR4ks#rGH|S^Plk)B&w&m+6)uAx!i8|g6w9iD+u;KE z2wVm8r-loRhRj+Sl>T&_47H*QU_QJKa>`nFz`pQxD2x9BwZgBVlCawFzq6God_lG3>AXe;tap&D~H3$xHBH_;*uZHZ9yvjfNLN4fGgPh+cwn z>3dK)@(I+0Ul{hiJFZXK*W&L7ff^4Jm~3;3%l^ zN+D6TWLqy$WS%$2nn0@}bV^iBKymhw7gR$+N@*t4gRBLX9&Qc42<&AQZi@0?PGq zsHFOd;i+&8_4DCyc(36bhSn1PI-=c%>aT`cNFy8uPlqGm^{@wg0?M!#VetL`DT;PM z$ED%E9|Dz~(_lY%kg2bO-Ki&`j@E64H=Fji3_pf4;2S8H58z_Zg2ut|umUOs(Pj9b z9c8u9&=c;2+Sd=j!SH1$1HOcMA#Ztj01Y=Rg<8o>sOMIj_BtpRXAHN&BI+kXohw(s z-tgDU@xNlXlLoEqWhfWD3+0hdp-#f?TnMU_A?ye{SBIX-%c97lBB%#OLb-k>)CASAGh7E{U=)soaVXcG1vSxCFc01Ud&8Yj z9(f2VNneC|?oFtLyl?8+4lBZmyF2pv=?nhAD=W|mpS`~(3 z6jZM43wyzXp$u4O`s+-4v#Fm572e)2sZWM_zS3|RlqU}}Y=T;-4;6|F;UMO>u0+xP+y!m;8dNTP2ls&mYr++kLR@C; z4{?IE7}mlI;Sw0(A|b5SGN}5+kbJY=hlju!{AgRA4Yi;fVYWZY-6(_L9}VA!)2Mei zG;FVcvb-AV#lxTs^I$)CEY!-+f}`L?aDTWP+VHPX&ks2)e6Ac8P@i=e{@2Ra(6AqD zhH-c!90!Xy*k#BaAE1)*MW}uL8q@^en)U%lgcA>j2hu(UDs&r; z!2e2?Gz}f#u`mKBAX-5a@)Lwe1ou04PB4HA`|Cl9T-*u$mqCs1K&UOM@+Pt+&_V-0 zGx~aXopi-NSB5gk6jQkzo@n$J4X=PY3woQ0)vT~gl|rdRJ`A+*=MJF!7=dg;w2MaY z?w{e=$frnF?)n?@67m%C7$TRxkK~GCD(}33{2KWKqRgJaV9&w6P~lsKJcuaPCn3`j zl`iyehdR(UtAR2$MAo_=g?tOj$NVb8XCP5TF;w|0GMYg~BDqq7@+xwMX?O;vkW-MY z$mz&&NUr=B$^%F@#`rrt7TG2LUy4#hBlo0;jfV4=s$&*A-_OWvfuDiLPxILit-RLinb*%-*o)N zQ24#kSHQE3UI&Nq&e3oHJlC`z19M5AYH_Cfz3 zsD&3!8oiLV9inM3f&V~GKzh>G-Ms%A^>-1KCy{fIg-8SP1Ts&iO+rz*GKBRBT!$Ql zj4=aUZTf`6k)`eG1?Cxjw5m)-6395}yWwvUoiVvG*gTh{;R3nluv`zEXgV{d?KC(V zsX#tL<{~P+kj6mcKij~8h>bXi%FQ9HGvVvVcSt^C?+e!;Dz6|}kDvLfQOc0>kPgO( z$JJ=caQH0J5$R{z#u)a27b5z92-m`99sYZHX(Cwx@hhp0HP-zVs*7LU>$|a`v zUU-+$Vcm`<;v2lWOwvhviTHu`>Uu9_H+!*|ope)aCz-a>^{$;@jHbqT zsd*>mCY!vdTb3Kli`Uss+ep*XiTIDlm=#Uby0gDO(yU2Aqn#VjUpnx*Zm~qOTWc?_ z_CFoCGVc&C=`PGT$y$HXplDmI_1HmuBAuOh)Q$P47aWt-(qwnK9zz;2+lyvmPSURD z&1NU*+RG~E*-mXOi%Qv1CvH2jW~U`(*SKi0L=;EW1}jZD4K8!%o-MQH#S$sknwN+r zlKi&wRcde5P5DC$U!9*!VnnRPcA6Y7=G4S~==wGX$<--aX4QJB#+cK>nnET_{%@14uP2^ZwJdxJ2GV$6(+%5A*3|TTLoW$PiOPk21Gbw-LkX>Ep zCz|82gyWAIy1iec>n5$LcwoCi;wD=!9(r_SkyjT_V5}2wFfPRK=%g3L#$Z1G z!O<&cYAXZ_T(J_b)wfo;bbRZ8F$Iyf9qEr5dq!KW^@g#1 zBO`+or%WeIZlec7xNVu}&mK3z-&s;$P+K2uEUizZ(zz$GKIyTuCXFla8y+3OBVj7~ zCFAz@3&$-O6ZSOMmH$t(T%W%>OqZ0KR{o?~-y3&lWJ++f?9G?p474|}eRUcnf^8IL zsI@mk{p65Q{v{JO9*{`dwc*|gPma)(Fm&IuW&^`%w7{#iZg6t?-6oziWoqe^a(nW= zGp1H_U+SdNrK^)pJQZ`&iR27>aiYPoS36GJvr9bmwA68}J10);kga3|O^y{J7bkPf zn^yK@tlf#cl>>*vhTRg{cc8r@LpCJrq~|m>d2aIlOKmR}9>YBQgY%wqKA4dcMWa^j zy)wdKQ{KNC=HDFoW&WFGuk_-eWv~>n_R^kz*Q7%VSy_Tpkwdh})5+52_s-?b{-Ndl z+T~b7d3~g7WjvmV#T@_H$tPtO=bXWy9DwE`NN^Fj97?rb(%ZT<5nKh0iBu{P=Y&ad z&T+DVx;Wv-1r3dA;8I{W(w%7c=HhDZgL*Gh>xCDB?geur$Q2QRC= zRWYx@ixc8tkL50T%QUls|3&y6#X0GOQHtna4nwpLf2JMhXcp)hwpdEz~FAF)H2gfF4wqUZriUZ z;(t}qXT_|V*}>lS?9D7c|F)U!FQAKN#UkUEl0QTuHa5Hs0!JkE&Ee$yo^zz%ZT6aCT|o*pcMw@$ z&#}RhGc~%5a?Pzr&Yss{iY}ucJ)n~(NPs2gK9awZ4NhEJp!MQ8{UUvSXpetWFWehnxtGE3PQMJMG}IiYtrK83Ge-fxy?gsnThe??1i+%}eIG>M?g!`|IkEc~`VM zNHgBu4{fa8LlkOn@o2v1CwrW_9_7@T_L_Gh#s*(P$s+RWt z{{&51P6xY@V%?=m4ubbSpN-k C7$5Qg delta 5937 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 XGIREn>E)%SxT2!8vWk(L%9-XbNJp@Y diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po index 328f5ea7..63163cf1 100644 --- a/locale/it_IT/LC_MESSAGES/messages.po +++ b/locale/it_IT/LC_MESSAGES/messages.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: raspap\n" "Report-Msgid-Bugs-To: Bill Zimmerman \n" "POT-Creation-Date: 2017-10-19 08:56+0000\n" -"PO-Revision-Date: 2021-01-21 10:40\n" -"Last-Translator: Luca Sasdelli\n" +"PO-Revision-Date: 2021-03-20 14:38\n" +"Last-Translator: Ioma Taani (iomataani)\n" "Language-Team: Italian\n" "Language: it_IT\n" "MIME-Version: 1.0\n" @@ -361,6 +361,24 @@ msgstr "Registra le richieste DHCP" msgid "Log DNS queries" msgstr "Registra query DNS" +msgid "Restrict access" +msgstr "Limita l'accesso" + +msgid "Limit network access to static clients" +msgstr "Limita l'accesso di rete ai client statici" + +msgid "Enable this option if you want RaspAP to ignore any clients which are not specified in the static leases list." +msgstr "Abilita questa opzione se vuoi che RaspAP ignori qualsiasi client non sono specificato nell'elenco dei lease statici." + +msgid "This option adds dhcp-ignore to the dnsmasq configuration." +msgstr "Questa opzione aggiunge dhcp-ignore alla configurazione di dnsmasq." + +msgid "Clients with a particular hardware MAC address can always be allocated the same IP address." +msgstr "I client con un particolare indirizzo MAC possono essere assegnati sempre allo stesso indirizzo IP." + +msgid "This option adds dhcp-host entries to the dnsmasq configuration." +msgstr "Questa opzione aggiunge dhcp-host alla configurazione dnsmasq." + #: includes/hostapd.php msgid "Basic" msgstr "Base" @@ -676,6 +694,36 @@ msgstr "Tentativo di avviare openvpn in corso" msgid "Attempting to stop openvpn" msgstr "Tentativo di arrestare openvpn in corso" +msgid "Configurations" +msgstr "Configurazioni" + +msgid "Currently available OpenVPN client configurations are displayed below." +msgstr "Le configurazioni client OpenVPN attualmente disponibili sono visualizzate di seguito." + +msgid "Activating a configuraton will restart the openvpn-client service." +msgstr "Attivando la configurazione si riavvierà il servizio openvpn-client." + +msgid "Delete OpenVPN client" +msgstr "Elimina client OpenVPN" + +msgid "Delete client configuration? This cannot be undone." +msgstr "Eliminare la configurazione del client? Questa operazione non può essere annullata." + +msgid "Activate OpenVPN client" +msgstr "Attiva client OpenVPN" + +msgid "Activate client configuration? This will restart the openvpn-client service." +msgstr "Attivare la configurazione del client? Questo riavvierà il servizio openvpn-client." + +msgid "Activate" +msgstr "Attiva" + +msgid "Cancel" +msgstr "Annulla" + +msgid "Enable this option to log openvpn activity." +msgstr "Abilita questa opzione per registrare l'attività di openvpn." + #: includes/torproxy.php msgid "TOR is not running" msgstr "TOR non è in esecuzione" @@ -799,3 +847,87 @@ msgstr "Host personalizzato non valido trovato sulla riga " msgid "Invalid custom host found on line " msgstr "Host personalizzato non valido trovato sulla riga " +msgid "Tunnel settings" +msgstr "Impostazioni del tunnel" + +msgid "Enable server" +msgstr "Abilita il server" + +msgid "Enable this option to encrypt traffic by creating a tunnel between RaspAP and configured peers." +msgstr "Abilita questa opzione per cifrare il traffico creando un tunnel tra RaspAP e peer configurati." + +msgid "This option adds wg0.conf to the WireGuard configuration." +msgstr "Questa opzione aggiunge wg0.conf alla configurazione di WireGuard." + +msgid "Local public key" +msgstr "Chiave pubblica locale" + +msgid "Local Port" +msgstr "Porta locale" + +msgid "IP Address" +msgstr "Indirizzo IP" + +msgid "DNS" +msgstr "DNS" + +msgid "Peer" +msgstr "Peer" + +msgid "Enable peer" +msgstr "Abilita peer" + +msgid "Enable this option to encrypt traffic by creating a tunnel between RaspAP and this peer." +msgstr "Abilita questa opzione per cifrare il traffico creando un tunnel tra RaspAP e questo peer." + +msgid "This option adds client.conf to the WireGuard configuration." +msgstr "Questa opzione aggiunge client.conf alla configurazione di WireGuard." + +msgid "Peer public key" +msgstr "Chiave pubblica del peer" + +msgid "Endpoint address" +msgstr "Indirizzo di endpoint" + +msgid "Allowed IPs" +msgstr "IP consentiti" + +msgid "Persistent keepalive" +msgstr "Keepalive permanente" + +msgid "Display WireGuard status" +msgstr "Mostra lo stato di WireGuard" + +msgid "Enable this option to display an updated WireGuard status." +msgstr "Abilita questa opzione per visualizzare lo stato aggiornato di WireGuard." + +msgid "Scan this QR code with your client to connect to this tunnel" +msgstr "Scansiona questo codice QR con il tuo client per connetterti a questo tunnel" + +msgid "or download the client.conf file to your device." +msgstr "o scarica il file client.conf sul tuo dispositivo." + +msgid "Download" +msgstr "Scarica" + +msgid "Start WireGuard" +msgstr "Avvia WireGuard" + +msgid "Stop WireGuard" +msgstr "Ferma WireGuard" + +msgid "Information provided by wireguard" +msgstr "Informazioni fornite da wireguard" + +msgid "Attempting to start WireGuard" +msgstr "Tentativo di avviare WireGuard in corso" + +msgid "Attempting to stop WireGuard" +msgstr "Tentativo di arrestare WireGuard in corso" + +msgid "WireGuard configuration updated successfully" +msgstr "Configurazione WireGuard aggiornata con successo" + +msgid "WireGuard configuration failed to be updated" +msgstr "Impossibile aggiornare la configurazione di WireGuard" + From 0c056b3833036030982f64562b1a92815895203a Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 21 Mar 2021 17:32:51 +0000 Subject: [PATCH 21/24] Update w/ api.raspap.com --- installers/raspbian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index e76adbe0..2750ff13 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -183,7 +183,7 @@ function _display_welcome() { function _get_release() { RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) if [ "$insiders" == 1 ]; then - RASPAP_INSIDERS_LATEST=$(curl -s "https://install.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) + RASPAP_INSIDERS_LATEST=$(curl -s "https://api.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else RASPAP_RELEASE="${RASPAP_LATEST}" From 1485d4509e75927bee022ff799af2e60d57cc396 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 27 Mar 2021 13:11:44 +0000 Subject: [PATCH 22/24] Set repo with --insiders option --- installers/raspbian.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 2750ff13..d056062c 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -181,12 +181,13 @@ function _display_welcome() { # Fetch latest release from GitHub or RaspAP Installer API function _get_release() { - RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) + readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' ) if [ "$insiders" == 1 ]; then - RASPAP_INSIDERS_LATEST=$(curl -s "https://api.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) - RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" + repo="RaspAP/raspap-insiders" + readonly RASPAP_INSIDERS_LATEST=$(curl -s "https://api.raspap.com/repos/RaspAP/raspap-insiders/releases/latest/" | grep -Po '"tag_name": "\K.*?(?=")' ) + readonly RASPAP_RELEASE="${RASPAP_INSIDERS_LATEST} Insiders" else - RASPAP_RELEASE="${RASPAP_LATEST}" + readonly RASPAP_RELEASE="${RASPAP_LATEST}" fi } From 77170a9a7b9587d470fcea44932ab14ddfd6762f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 02:31:36 +0000 Subject: [PATCH 23/24] Bump y18n from 3.2.1 to 3.2.2 Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2b445d7f..0da79a7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4717,9 +4717,9 @@ xtend@~4.0.0, xtend@~4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== y18n@^4.0.0: version "4.0.0" From 8d4cf1c96d9085c5b3af335cc636ec323c83e168 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 31 Mar 2021 19:48:34 +0100 Subject: [PATCH 24/24] Update country_code optionv values --- templates/hostapd/advanced.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/hostapd/advanced.php b/templates/hostapd/advanced.php index d0559cfe..f7c9ee93 100644 --- a/templates/hostapd/advanced.php +++ b/templates/hostapd/advanced.php @@ -233,7 +233,7 @@ - + @@ -281,7 +281,7 @@ - +