From cc1223369ff35c605d06c3cbe957b34c2701fbc4 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 10 Apr 2021 16:25:22 -0500 Subject: [PATCH] Update tests --- .github/workflows/cron.yml | 34 ++++++++++++++++++++++------------ .github/workflows/main.yml | 34 ++++++++++++++++++++++------------ 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 3d87ad4..13b292a 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -176,15 +176,20 @@ jobs: certutil -L -d sql:/etc/ipsec.d rm -f /etc/ipsec.d/vpnclient* - VPN_DNS_NAME=vpn.example.com VPN_DNS_SRV1=1.1.1.1 VPN_DNS_SRV2=1.0.0.1 bash ikev2.sh --auto + + VPN_CLIENT_NAME=vpnclient1 \ + VPN_DNS_NAME=vpn.example.com \ + VPN_DNS_SRV1=1.1.1.1 \ + VPN_DNS_SRV2=1.0.0.1 \ + bash ikev2.sh --auto grep -q 'leftid=@vpn.example.com' /etc/ipsec.d/ikev2.conf grep -q 'modecfgdns="1.1.1.1 1.0.0.1"' /etc/ipsec.d/ikev2.conf - ls -ld /etc/ipsec.d/vpnclient.mobileconfig - ls -ld /etc/ipsec.d/vpnclient.sswan - ls -ld /etc/ipsec.d/vpnclient.p12 - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.mobileconfig - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.sswan + ls -ld /etc/ipsec.d/vpnclient1.mobileconfig + ls -ld /etc/ipsec.d/vpnclient1.sswan + ls -ld /etc/ipsec.d/vpnclient1.p12 + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.mobileconfig + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.sswan if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then systemctl restart ipsec sleep 10 @@ -505,15 +510,20 @@ jobs: certutil -L -d sql:/etc/ipsec.d rm -f /etc/ipsec.d/vpnclient* - VPN_DNS_NAME=vpn.example.com VPN_DNS_SRV1=1.1.1.1 VPN_DNS_SRV2=1.0.0.1 bash ikev2.sh --auto + + VPN_CLIENT_NAME=vpnclient1 \ + VPN_DNS_NAME=vpn.example.com \ + VPN_DNS_SRV1=1.1.1.1 \ + VPN_DNS_SRV2=1.0.0.1 \ + bash ikev2.sh --auto grep -q 'leftid=@vpn.example.com' /etc/ipsec.d/ikev2.conf grep -q 'modecfgdns="1.1.1.1 1.0.0.1"' /etc/ipsec.d/ikev2.conf - ls -ld /etc/ipsec.d/vpnclient.mobileconfig - ls -ld /etc/ipsec.d/vpnclient.sswan - ls -ld /etc/ipsec.d/vpnclient.p12 - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.mobileconfig - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.sswan + ls -ld /etc/ipsec.d/vpnclient1.mobileconfig + ls -ld /etc/ipsec.d/vpnclient1.sswan + ls -ld /etc/ipsec.d/vpnclient1.p12 + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.mobileconfig + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.sswan sleep 10 grep pluto /var/log/auth.log | tail -n 20 ipsec status diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ce7fba..4680f13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -208,15 +208,20 @@ jobs: certutil -L -d sql:/etc/ipsec.d rm -f /etc/ipsec.d/vpnclient* - VPN_DNS_NAME=vpn.example.com VPN_DNS_SRV1=1.1.1.1 VPN_DNS_SRV2=1.0.0.1 bash ikev2.sh --auto + + VPN_CLIENT_NAME=vpnclient1 \ + VPN_DNS_NAME=vpn.example.com \ + VPN_DNS_SRV1=1.1.1.1 \ + VPN_DNS_SRV2=1.0.0.1 \ + bash ikev2.sh --auto grep -q 'leftid=@vpn.example.com' /etc/ipsec.d/ikev2.conf grep -q 'modecfgdns="1.1.1.1 1.0.0.1"' /etc/ipsec.d/ikev2.conf - ls -ld /etc/ipsec.d/vpnclient.mobileconfig - ls -ld /etc/ipsec.d/vpnclient.sswan - ls -ld /etc/ipsec.d/vpnclient.p12 - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.mobileconfig - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.sswan + ls -ld /etc/ipsec.d/vpnclient1.mobileconfig + ls -ld /etc/ipsec.d/vpnclient1.sswan + ls -ld /etc/ipsec.d/vpnclient1.p12 + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.mobileconfig + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.sswan if [ "$1" = "centos" ] || [ "$1" = "amazon" ]; then systemctl restart ipsec sleep 10 @@ -540,15 +545,20 @@ jobs: certutil -L -d sql:/etc/ipsec.d rm -f /etc/ipsec.d/vpnclient* - VPN_DNS_NAME=vpn.example.com VPN_DNS_SRV1=1.1.1.1 VPN_DNS_SRV2=1.0.0.1 bash ikev2.sh --auto + + VPN_CLIENT_NAME=vpnclient1 \ + VPN_DNS_NAME=vpn.example.com \ + VPN_DNS_SRV1=1.1.1.1 \ + VPN_DNS_SRV2=1.0.0.1 \ + bash ikev2.sh --auto grep -q 'leftid=@vpn.example.com' /etc/ipsec.d/ikev2.conf grep -q 'modecfgdns="1.1.1.1 1.0.0.1"' /etc/ipsec.d/ikev2.conf - ls -ld /etc/ipsec.d/vpnclient.mobileconfig - ls -ld /etc/ipsec.d/vpnclient.sswan - ls -ld /etc/ipsec.d/vpnclient.p12 - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.mobileconfig - grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient.sswan + ls -ld /etc/ipsec.d/vpnclient1.mobileconfig + ls -ld /etc/ipsec.d/vpnclient1.sswan + ls -ld /etc/ipsec.d/vpnclient1.p12 + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.mobileconfig + grep -q 'vpn.example.com' /etc/ipsec.d/vpnclient1.sswan sleep 10 grep pluto /var/log/auth.log | tail -n 20 ipsec status