Update tests

- Add Ubuntu 22.04, which is expected to be released on April 21, 2022.

.github/workflows/test_set_2.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository_owner == 'hwdsl2'
     strategy:
       matrix:
-        os_version: ["ubuntu:20.04", "ubuntu:18.04", "debian:11", "debian:10", "debian:9", "alpine:3.14", "alpine:3.15"]
+        os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:11", "debian:10", "debian:9", "alpine:3.14", "alpine:3.15"]
       fail-fast: false
     container:
       image: ${{ matrix.os_version }}
@@ -84,7 +84,11 @@ jobs:
             apt-get -yqq update
             apt-get -yqq dist-upgrade
             apt-get -yqq install wget rsyslog
-            service rsyslog start
+            if grep -qs bookworm /etc/debian_version; then
+              rsyslogd
+            else
+              service rsyslog start
+            fi
           fi
 
           cp -f "$GITHUB_WORKSPACE"/vpnsetup.sh .

README-zh.md

@@ -80,7 +80,7 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh -o
 
 一个云服务器，虚拟专用服务器 (VPS) 或者专用服务器，全新安装以下操作系统之一：
 
-- Ubuntu 20.04 或者 18.04
+- Ubuntu 22.04, 20.04 或者 18.04
 - Debian 11[\*](#debian-10-note), 10[\*](#debian-10-note) 或者 9
 - CentOS 7 或者 CentOS Stream 8[\*\*](#centos-8-note)
 - Rocky Linux 或者 AlmaLinux 8

README.md

@@ -80,7 +80,7 @@ A pre-built [Docker image](https://github.com/hwdsl2/docker-ipsec-vpn-server) is
 
 A cloud server, virtual private server (VPS) or dedicated server, freshly installed with one of the following OS:
 
-- Ubuntu 20.04 or 18.04
+- Ubuntu 22.04, 20.04 or 18.04
 - Debian 11[\*](#debian-10-note), 10[\*](#debian-10-note) or 9
 - CentOS 7 or CentOS Stream 8[\*\*](#centos-8-note)
 - Rocky Linux or AlmaLinux 8

vpnsetup_alpine.sh

@@ -498,13 +498,24 @@ start_services() {
   bigecho "Starting services..."
   sysctl -e -q -p
 
-  chmod +x /etc/rc.local
   chmod 600 /etc/ipsec.secrets* /etc/ppp/chap-secrets* /etc/ipsec.d/passwd*
 
   mkdir -p /run/pluto
   service fail2ban restart >/dev/null 2>&1
   service ipsec restart >/dev/null 2>&1
   service xl2tpd restart >/dev/null 2>&1
+
+  mkdir -p /etc/crontabs
+  cron_cmd="rc-service -c ipsec zap start"
+if ! grep -qs "$cron_cmd" /etc/crontabs/root; then
+cat >> /etc/crontabs/root <<EOF
+* * * * * $cron_cmd
+* * * * * sleep 15; $cron_cmd
+* * * * * sleep 30; $cron_cmd
+* * * * * sleep 45; $cron_cmd
+EOF
+  touch /etc/crontabs/cron.update
+fi
 }
 
 show_vpn_info() {