Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch test into master

Browse source 
fixes #1234
ci/cd fixes and improvements
This commit is contained in:
4s3ti 2021-02-06 23:04:11 +01:00
commit d7771c2514
2 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
.travis.yml
View file

@ -22,32 +22,14 @@ branches:
jobs: jobs:
allow_failures: allow_failures:
- stage: lint - stage: lint
include: include:
- stage: lint - stage: lint
name: "Shellcheck lint" name: "Shellcheck lint"
dist: linux dist: linux
script: script:
- shellcheck autoinstall/install.sh - shellcheck autoinstall/install.sh
- shellcheck scripts/backup.sh - find scripts/ -type f -exec shellcheck {} \;
- shellcheck scripts/pivpn
- shellcheck scripts/self_check.sh
- shellcheck scripts/uninstall.sh
- shellcheck scripts/update.sh
- shellcheck scripts/openvpn/clientstat.sh
- shellcheck scripts/openvpn/listOVPN.sh
- shellcheck scripts/openvpn/makeOVPN.sh
- shellcheck scripts/openvpn/pivpnDebug.sh
- shellcheck scripts/openvpn/pivpn.sh
- shellcheck scripts/openvpn/removeOVPN.sh
- shellcheck scripts/wireguard/clientSTAT.sh
- shellcheck scripts/wireguard/disableCONF.sh
- shellcheck scripts/wireguard/enableCONF.sh
- shellcheck scripts/wireguard/listCONF.sh
- shellcheck scripts/wireguard/makeCONF.sh
- shellcheck scripts/wireguard/pivpnDEBUG.sh
- shellcheck scripts/wireguard/pivpn.sh
- shellcheck scripts/wireguard/qrcodeCONF.sh
- shellcheck scripts/wireguard/removeCONF.sh
- stage: test - stage: test
name: "OpenVPN Xenial & Commands" name: "OpenVPN Xenial & Commands"
@ -59,15 +41,16 @@ jobs:
- ./ciscripts/startup.sh -o - ./ciscripts/startup.sh -o
script: script:
- sudo ./auto_install/install.sh --unattended ciscripts/ci_openvpn.conf - sudo ./auto_install/install.sh --unattended ciscripts/ci_openvpn.conf
after_script:
- systemctl status openvpn - systemctl status openvpn
- pivpn add -n foo nopass -d 180 - pivpn add -n foo nopass -d 180
- pivpn add -p "$RANDOM$RANDOM" -n bar -d 180 - pivpn add -p "$RANDOM$RANDOM" -n bar -d 180
- pivpn add -o -n foo - pivpn add -o -n foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup - ls ~pi/pivpnbackup/ | grep backup
- pivpn -r foo -y
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y
after_fail: after_fail:
- sudo journalctl -xe - sudo journalctl -xe
@ -81,14 +64,15 @@ jobs:
- ./ciscripts/startup.sh -w - ./ciscripts/startup.sh -w
script: script:
- sudo ./auto_install/install.sh --unattended ciscripts/ci_wireguard.conf - sudo ./auto_install/install.sh --unattended ciscripts/ci_wireguard.conf
after_script:
- systemctl status wg-quick@wg0
- pivpn add -n foo - pivpn add -n foo
- pivpn -qr foo - pivpn -qr foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y - pivpn -r foo -y
after_script:
- systemctl status wg-quick@wg0
after_fail: after_fail:
- sudo journalctl -xe - sudo journalctl -xe
@ -108,9 +92,9 @@ jobs:
- pivpn add -o -n foo - pivpn add -o -n foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup - ls ~pi/pivpnbackup/ | grep backup
- pivpn -r foo -y
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y
after_fail: after_fail:
- sudo journalctl -xe - sudo journalctl -xe
@ -129,6 +113,7 @@ jobs:
- pivpn add -n foo - pivpn add -n foo
- pivpn -qr foo - pivpn -qr foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y - pivpn -r foo -y
@ -151,9 +136,9 @@ jobs:
- pivpn add -o -n foo - pivpn add -o -n foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup - ls ~pi/pivpnbackup/ | grep backup
- pivpn -r foo -y
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y
after_fail: after_fail:
- sudo journalctl -xe - sudo journalctl -xe
@ -171,6 +156,7 @@ jobs:
- pivpn add -n foo - pivpn add -n foo
- pivpn -qr foo - pivpn -qr foo
- pivpn -bk - pivpn -bk
- ls ~pi/pivpnbackup/ | grep backup
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y - pivpn -r foo -y

2
scripts/wireguard/clientSTAT.sh
View file

@ -6,7 +6,7 @@ CONF_FILE="/etc/wireguard/wg0.conf"
if [ ! -s "$CLIENTS_FILE" ]; then if [ ! -s "$CLIENTS_FILE" ]; then
echo "::: There are no clients to list" echo "::: There are no clients to list"
exit 1 exit 0
fi fi
scriptusage(){ scriptusage(){