From 317c4dbdbf2bcfd4bd867cc3d5502a4a1738c3ee Mon Sep 17 00:00:00 2001 From: randomshell Date: Thu, 7 May 2020 20:07:25 +0000 Subject: [PATCH 01/19] Remove easy-rsa <3.0.7 workaround We have easy-rsa 3.0.7 and it's not needed anymore --- openvpn-install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 5f49ada..4a9e347 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -719,11 +719,6 @@ function installOpenVPN() { # Create the PKI, set up the CA, the DH params and the server certificate ./easyrsa init-pki - - # Workaround to remove unharmful error until easy-rsa 3.0.7 - # https://github.com/OpenVPN/easy-rsa/issues/261 - sed -i 's/^RANDFILE/#RANDFILE/g' pki/openssl-easyrsa.cnf - ./easyrsa --batch build-ca nopass if [[ $DH_TYPE == "2" ]]; then From 6ee5787a29440b7dfcdfd61653eb8bb0dac8ff50 Mon Sep 17 00:00:00 2001 From: Stanislas Date: Sun, 10 May 2020 22:27:57 +0200 Subject: [PATCH 02/19] Add contributors hall-of-fame --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f93e55..67c3965 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,22 @@ Solutions that provision a ready to use OpenVPN server based on this script in o - AWS using Terraform at [`openvpn-terraform-install`](https://github.com/dumrauf/openvpn-terraform-install) -## Contributing / Code formatting +## Contributing + +### Contributors hall-of-fame + +Thanks ❤️ + +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/0)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/1)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/2)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/3)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/4)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/5)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/6)](https://github.com/angristan/openvpn-install/graphs/contributors) +[![](https://sourcerer.io/fame/angristan/angristan/openvpn-install/images/7)](https://github.com/angristan/openvpn-install/graphs/contributors) + +### Code formatting We use [shellcheck](https://github.com/koalaman/shellcheck) and [shfmt](https://github.com/mvdan/sh) to enforce bash styling guidelines and good practices. They are executed for each commit / PR with GitHub Actions, so you can check the configuration [here](https://github.com/angristan/openvpn-install/blob/master/.github/workflows/push.yml). From b2888fa514946edb1aa9803eeb1780b5c90b3bc7 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sat, 16 May 2020 01:36:18 +0530 Subject: [PATCH 03/19] readme: fix typo (#664) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67c3965..759540f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ In your home directory, you will have `.ovpn` files. These are the client config If you have any question, head to the [FAQ](#faq) first. Please read everything before opening an issue. -**PLEASE do net send me emails or private messages asking for help.** The only place to get help is the issues. Other people may be able to help and in the future, other users may also run into the same issue as you. My time is not available for free just for you, you're not special. +**PLEASE do not send me emails or private messages asking for help.** The only place to get help is the issues. Other people may be able to help and in the future, other users may also run into the same issue as you. My time is not available for free just for you, you're not special. ### Headless install From 15b2c986af5047ad26aa2d7b6d32c932f34d7b8e Mon Sep 17 00:00:00 2001 From: robiiinos Date: Fri, 26 Jun 2020 22:37:38 +0200 Subject: [PATCH 04/19] ci: make linter great again --- .github/workflows/lint.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4628851..13ffd36 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,19 +7,21 @@ on: - master name: Lint + jobs: shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: shellcheck - uses: ludeeus/action-shellcheck@0.0.1 + uses: ludeeus/action-shellcheck@0.2.1 env: SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009 + shfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: shfmt uses: bltavares/actions/shfmt@master env: From 101f0365ba4e1bbffa21799479c0dea6098ee39f Mon Sep 17 00:00:00 2001 From: Stanislas Lange Date: Fri, 26 Jun 2020 23:30:07 +0200 Subject: [PATCH 05/19] deps: add dependabot for actions versions --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f4d737f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + assignees: + - "angristan" + reviewers: + - "angristan" From b11296870ffdb397168f142f1cc48ec7ebb8b0a8 Mon Sep 17 00:00:00 2001 From: robiiinos Date: Sat, 27 Jun 2020 12:29:43 +0200 Subject: [PATCH 06/19] Typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 759540f..dae8552 100644 --- a/README.md +++ b/README.md @@ -216,7 +216,7 @@ Most of OpenVPN's encryption-related stuff is managed by [Easy-RSA](https://gith By default, OpenVPN doesn't enable compression. This script provides support for LZ0 and LZ4 (v1/v2) algorithms, the latter being more efficient. -However, it is discouraged to use compression since it since the [VORACLE attack](https://protonvpn.com/blog/voracle-attack/) makes use of it. +However, it is discouraged to use compression since the [VORACLE attack](https://protonvpn.com/blog/voracle-attack/) makes use of it. ### TLS version From ed26d6a649bf5396f999cc9508dfaaf276c185ad Mon Sep 17 00:00:00 2001 From: robiiinos Date: Sat, 27 Jun 2020 12:30:20 +0200 Subject: [PATCH 07/19] Update error message on CentOS install --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 4a9e347..9ddcbb8 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -61,7 +61,7 @@ function checkOS() { if [[ ! $VERSION_ID =~ (7|8) ]]; then echo "⚠️ Your version of CentOS is not supported." echo "" - echo "The script only support CentOS 7." + echo "The script only support CentOS 7 and CentOS 8." echo "" exit 1 fi From 2a73a41f715f8d1e06299d58bdbb283fadd51294 Mon Sep 17 00:00:00 2001 From: robiiinos Date: Sat, 27 Jun 2020 12:44:22 +0200 Subject: [PATCH 08/19] Add new dns leak tests to FAQ --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index b891666..8c894c0 100644 --- a/FAQ.md +++ b/FAQ.md @@ -10,7 +10,7 @@ You can, of course, it's even recommended, update the `openvpn` package with you **Q:** How do I check for DNS leaks? -**A:** Go to [dnsleaktest.com](https://dnsleaktest.com/) or [ipleak.net](https://ipleak.net/) with your browser. Only your server's IP should show up. +**A:** Go to [browserleaks.com](https://browserleaks.com/dns) or [ipleak.net](https://ipleak.net/) (both perform IPv4 and IPv6 check) with your browser. Only your server's IP should show up. --- From 3f04a554ef31ac5093ef4fc9ccf67b25943e8f1a Mon Sep 17 00:00:00 2001 From: Stanislas Date: Sun, 28 Jun 2020 19:56:27 +0200 Subject: [PATCH 09/19] Update FUNDING.yml --- .github/FUNDING.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7d1aa44..d5689d8 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ -patreon: angristan -liberapay: angristan -ko_fi: angristan +patreon: stanislas +liberapay: stanislas +ko_fi: stanislas From 9e1fe367bf8452fa19d2d5b46cb8263792f4f9d7 Mon Sep 17 00:00:00 2001 From: robiiinos Date: Mon, 29 Jun 2020 09:09:38 +0200 Subject: [PATCH 10/19] Default DNS to AdGuard --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 9ddcbb8..5bdcf9f 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -315,7 +315,7 @@ function installQuestions() { echo " 12) NextDNS (Anycast: worldwide)" echo " 13) Custom" until [[ $DNS =~ ^[0-9]+$ ]] && [ "$DNS" -ge 1 ] && [ "$DNS" -le 13 ]; do - read -rp "DNS [1-12]: " -e -i 3 DNS + read -rp "DNS [1-12]: " -e -i 11 DNS if [[ $DNS == 2 ]] && [[ -e /etc/unbound/unbound.conf ]]; then echo "" echo "Unbound is already installed." From a35cd2eca4dce9eb9698785cecc32c3faf59babf Mon Sep 17 00:00:00 2001 From: cn3lfs Date: Tue, 30 Jun 2020 15:14:19 +0800 Subject: [PATCH 11/19] change mkdir to mkdir -p for directory not exist change mkdir to mkdir -p for directory /etc/openvpn/easy-rsa not exist --- openvpn-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 9ddcbb8..0ae3821 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -694,7 +694,7 @@ function installOpenVPN() { if [[ ! -d /etc/openvpn/easy-rsa/ ]]; then local version="3.0.7" wget -O ~/easy-rsa.tgz https://github.com/OpenVPN/easy-rsa/releases/download/v${version}/EasyRSA-${version}.tgz - mkdir /etc/openvpn/easy-rsa + mkdir -p /etc/openvpn/easy-rsa tar xzf ~/easy-rsa.tgz --strip-components=1 --directory /etc/openvpn/easy-rsa rm -f ~/easy-rsa.tgz From bbd29a81782adaaf6dff02f48b9016eb1c9a765e Mon Sep 17 00:00:00 2001 From: randomshell Date: Thu, 2 Jul 2020 20:04:26 +0000 Subject: [PATCH 12/19] Update easy-rsa link in README to 3.0.7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dae8552..730ac49 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ OpenVPN 2.4 was a great update regarding encryption. It added support for ECDSA, If you want more information about an option mentioned below, head to the [OpenVPN manual](https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage). It is very complete. -Most of OpenVPN's encryption-related stuff is managed by [Easy-RSA](https://github.com/OpenVPN/easy-rsa). Defaults parameters are in the [vars.example](https://github.com/OpenVPN/easy-rsa/blob/v3.0.6/easyrsa3/vars.example) file. +Most of OpenVPN's encryption-related stuff is managed by [Easy-RSA](https://github.com/OpenVPN/easy-rsa). Defaults parameters are in the [vars.example](https://github.com/OpenVPN/easy-rsa/blob/v3.0.7/easyrsa3/vars.example) file. ### Compression From d37ffde48ec241e35f5c6f1b28aa06ec028a888c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2020 06:11:26 +0000 Subject: [PATCH 13/19] build(deps): bump ludeeus/action-shellcheck from 0.2.1 to 0.4.1 Bumps [ludeeus/action-shellcheck](https://github.com/ludeeus/action-shellcheck) from 0.2.1 to 0.4.1. - [Release notes](https://github.com/ludeeus/action-shellcheck/releases) - [Commits](https://github.com/ludeeus/action-shellcheck/compare/0.2.1...2394c9008b9dfe3897187f907e93b57eedeeedb2) Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 13ffd36..90c178e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: shellcheck - uses: ludeeus/action-shellcheck@0.2.1 + uses: ludeeus/action-shellcheck@0.4.1 env: SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009 From b4773385a48235d444b12adc2b04caccbfd96ac5 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Fri, 17 Jul 2020 22:10:31 +0300 Subject: [PATCH 14/19] Updated client name input restrictions and hint --- openvpn-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index 9ddcbb8..9242f41 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -1052,9 +1052,9 @@ verb 3" >>/etc/openvpn/client-template.txt function newClient() { echo "" echo "Tell me a name for the client." - echo "Use one word only, no special characters." + echo "The name must consist of alphanumeric character. It may also include an underscore or a dash." - until [[ $CLIENT =~ ^[a-zA-Z0-9_]+$ ]]; do + until [[ $CLIENT =~ ^[a-zA-Z0-9_-]+$ ]]; do read -rp "Client name: " -e CLIENT done From 54b884e7b11ec1b48e20e4fc9515bf9d1e53b872 Mon Sep 17 00:00:00 2001 From: "D. Robin" <16455953+robiiinos@users.noreply.github.com> Date: Sat, 25 Jul 2020 17:06:55 +0200 Subject: [PATCH 15/19] Pin GitHub Actions version (#702) --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7b1e1c..c37f47e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - centos-7-x64 - centos-8-x64 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Setup doctl uses: digitalocean/action-doctl@v2 @@ -51,7 +51,7 @@ jobs: - name: Setup remote server (Debian/Ubuntu) if: steps.server_os.outputs.value == 'debian' || steps.server_os.outputs.value == 'ubuntu' - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.2 with: host: ${{ steps.server_ip.outputs.value }} username: root @@ -60,7 +60,7 @@ jobs: - name: Setup remote server (Fedora) if: steps.server_os.outputs.value == 'fedora' - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.2 with: host: ${{ steps.server_ip.outputs.value }} username: root @@ -69,7 +69,7 @@ jobs: - name: Setup remote server (CentOS) if: steps.server_os.outputs.value == 'centos' - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.2 with: host: ${{ steps.server_ip.outputs.value }} username: root @@ -77,7 +77,7 @@ jobs: script: set -x && yum install -y git - name: Download repo and checkout current commit - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.2 with: host: ${{ steps.server_ip.outputs.value }} username: root @@ -85,7 +85,7 @@ jobs: script: set -x && git clone https://github.com/angristan/openvpn-install.git && cd openvpn-install && git checkout ${{ github.event.pull_request.head.sha }} - name: Run openvpn-install.sh in headless mode - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.2 with: host: ${{ steps.server_ip.outputs.value }} username: root From 5c2a86f27e8de46074d760dee490d46d2d26c1d5 Mon Sep 17 00:00:00 2001 From: randomshell Date: Tue, 28 Jul 2020 10:24:57 +0000 Subject: [PATCH 16/19] Update distro compatibility list and remove Debian 8 support (#654) --- README.md | 9 ++++----- openvpn-install.sh | 9 ++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 730ac49..a82f069 100644 --- a/README.md +++ b/README.md @@ -117,13 +117,12 @@ The script supports these OS and architectures: | --------------- | ---- | ----- | ----- | ----- | | Amazon Linux 2 | ❔ | ✅ | ❔ | ❔ | | Arch Linux | ❔ | ✅ | ❔ | ✅ | -| CentOS 7 | ❔ | ✅ | ❌ | ✅ | -| CentOS 8 | ❌ | ✅ | ❔ | ❔ | -| Debian 8 | ✅ | ✅ | ❌ | ❌ | -| Debian >= 9 | ❌ | ✅ | ✅ | ✅ | +| CentOS 7 | ✅ | ✅ | ✅ | ✅ | +| CentOS 8 | ❌ | ✅ | ❌ | ✅ | +| Debian >= 9 | ✅ | ✅ | ✅ | ✅ | | Fedora >= 27 | ❔ | ✅ | ❔ | ❔ | | Ubuntu 16.04 | ✅ | ✅ | ❌ | ❌ | -| Ubuntu >= 18.04 | ❌ | ✅ | ✅ | ✅ | +| Ubuntu >= 18.04 | ✅ | ✅ | ✅ | ✅ | To be noted: diff --git a/openvpn-install.sh b/openvpn-install.sh index 5bdcf9f..0529726 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -22,10 +22,10 @@ function checkOS() { source /etc/os-release if [[ $ID == "debian" || $ID == "raspbian" ]]; then - if [[ $VERSION_ID -lt 8 ]]; then + if [[ $VERSION_ID -lt 9 ]]; then echo "⚠️ Your version of Debian is not supported." echo "" - echo "However, if you're using Debian >= 8 or unstable/testing then you can continue, at your own risk." + echo "However, if you're using Debian >= 9 or unstable/testing then you can continue, at your own risk." echo "" until [[ $CONTINUE =~ (y|n) ]]; do read -rp "Continue? [y/n]: " -e CONTINUE @@ -653,11 +653,6 @@ function installOpenVPN() { apt-get update apt-get -y install ca-certificates gnupg # We add the OpenVPN repo to get the latest version. - if [[ $VERSION_ID == "8" ]]; then - echo "deb http://build.openvpn.net/debian/openvpn/stable jessie main" >/etc/apt/sources.list.d/openvpn.list - wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - - apt-get update - fi if [[ $VERSION_ID == "16.04" ]]; then echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" >/etc/apt/sources.list.d/openvpn.list wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - From a486d07436967fe26b6f74be937c842218dcbce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 05:54:32 +0000 Subject: [PATCH 17/19] build(deps): bump ludeeus/action-shellcheck from 0.4.1 to 0.5.0 Bumps [ludeeus/action-shellcheck](https://github.com/ludeeus/action-shellcheck) from 0.4.1 to 0.5.0. - [Release notes](https://github.com/ludeeus/action-shellcheck/releases) - [Commits](https://github.com/ludeeus/action-shellcheck/compare/0.4.1...c489c81f79527f818be72b97b918b06e75eaee6d) Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 90c178e..34e2736 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: shellcheck - uses: ludeeus/action-shellcheck@0.4.1 + uses: ludeeus/action-shellcheck@0.5.0 env: SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009 From 9579e29ccf3c7691007bc0c1e8b035a76fdc95d8 Mon Sep 17 00:00:00 2001 From: Stanislas Lange Date: Thu, 30 Jul 2020 12:44:57 +0200 Subject: [PATCH 18/19] Update provider links --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a82f069..23a3957 100644 --- a/README.md +++ b/README.md @@ -145,8 +145,9 @@ More Q&A in [FAQ.md](FAQ.md). **A:** I recommend these: - [Vultr](https://goo.gl/Xyd1Sc): Worldwide locations, IPv6 support, starting at \$3.50/month -- [PulseHeberg](https://goo.gl/76yqW5): France, unlimited bandwidth, starting at €3/month +- [Hetzner](https://hetzner.cloud/?ref=ywtlvZsjgeDq): Germany, IPv6, 20 TB of traffic, starting at €3/month - [Digital Ocean](https://goo.gl/qXrNLK): Worldwide locations, IPv6 support, starting at \$5/month +- [PulseHeberg](https://goo.gl/76yqW5): France, unlimited bandwidth, starting at €3/month --- From 1e3006c9ecd9f36b35b7a40074c023429b758e88 Mon Sep 17 00:00:00 2001 From: Stanislas Lange Date: Mon, 3 Aug 2020 17:50:40 +0200 Subject: [PATCH 19/19] Shellcheck: move excludes to action env --- .github/workflows/lint.yml | 28 +++++++++++----------------- openvpn-install.sh | 3 --- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 34e2736..7aaf095 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,10 +1,4 @@ -on: - push: - branches: - - master - pull_request: - branches: - - master +on: push name: Lint @@ -12,17 +6,17 @@ jobs: shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: shellcheck - uses: ludeeus/action-shellcheck@0.5.0 - env: - SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009 + - uses: actions/checkout@v2 + - name: shellcheck + uses: ludeeus/action-shellcheck@0.5.0 + env: + SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009 shfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: shfmt - uses: bltavares/actions/shfmt@master - env: - SHFMT_ARGS: -d + - uses: actions/checkout@v2 + - name: shfmt + uses: bltavares/actions/shfmt@master + env: + SHFMT_ARGS: -d diff --git a/openvpn-install.sh b/openvpn-install.sh index c0fe624..685f607 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -18,7 +18,6 @@ function tunAvailable() { function checkOS() { if [[ -e /etc/debian_version ]]; then OS="debian" - # shellcheck disable=SC1091 source /etc/os-release if [[ $ID == "debian" || $ID == "raspbian" ]]; then @@ -51,7 +50,6 @@ function checkOS() { fi fi elif [[ -e /etc/system-release ]]; then - # shellcheck disable=SC1091 source /etc/os-release if [[ $ID == "fedora" ]]; then OS="fedora" @@ -1206,7 +1204,6 @@ function removeUnbound() { function removeOpenVPN() { echo "" - # shellcheck disable=SC2034 read -rp "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE if [[ $REMOVE == 'y' ]]; then # Get OpenVPN port from the configuration