[pull] master from hwdsl2:master

.github/ISSUE_TEMPLATE/00-bug-report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Tell us about a problem you are experiencing
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Checklist**
+
+- [ ] I read the [README](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md)
+- [ ] I read the [Important notes](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#important-notes)
+- [ ] I followed instructions to [configure VPN clients](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#next-steps)
+- [ ] I checked [IKEv1 troubleshooting](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#ikev1-troubleshooting), [IKEv2 troubleshooting](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/ikev2-howto.md#ikev2-troubleshooting) and [VPN status](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#check-logs-and-vpn-status)
+- [ ] I searched existing [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue)
+- [ ] This bug is about the VPN setup scripts, and not IPsec VPN itself
+
+<!---
+If you found a reproducible bug for the IPsec VPN, open a bug report at https://github.com/libreswan/libreswan. Ask VPN-related questions on the [Libreswan](https://lists.libreswan.org/mailman/listinfo/swan) or [strongSwan](https://lists.strongswan.org/mailman/listinfo/users) users mailing list, or search e.g. [Stack Overflow](https://stackoverflow.com/questions/tagged/vpn).
+--->
+
+**Describe the issue**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. ...
+2. ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+[Check logs and VPN status](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#check-logs-and-vpn-status), and add error logs to help explain the problem, if applicable.
+
+**Server (please complete the following information)**
+- OS: [e.g. Debian 11]
+- Hosting provider (if applicable): [e.g. GCP, AWS]
+
+**Client (please complete the following information)**
+- Device: [e.g. iPhone 12]
+- OS: [e.g. iOS 15]
+- VPN mode: [IPsec/L2TP, IPsec/XAuth ("Cisco IPsec") or IKEv2]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/10-bug-report-zh.md

@@ -0,0 +1,48 @@
+---
+name: 错误报告
+about: 请使用这个模板来提交 bug
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**任务列表**
+
+- [ ] 我已阅读 [自述文件](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md)
+- [ ] 我已阅读 [重要提示](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#重要提示)
+- [ ] 我已按照说明 [配置 VPN 客户端](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#下一步)
+- [ ] 我检查了 [IKEv1 故障排除](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#ikev1-故障排除)，[IKEv2 故障排除](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/ikev2-howto-zh.md#ikev2-故障排除) 以及 [VPN 状态](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#检查日志及-vpn-状态)
+- [ ] 我搜索了已有的 [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue)
+- [ ] 这个 bug 是关于 VPN 安装脚本，而不是 IPsec VPN 本身
+
+<!---
+如果你发现了 IPsec VPN 的一个可重复的程序漏洞，请在 https://github.com/libreswan/libreswan 提交一个错误报告。VPN 的相关问题可在 [Libreswan](https://lists.libreswan.org/mailman/listinfo/swan) 或 [strongSwan](https://lists.strongswan.org/mailman/listinfo/users) 用户邮件列表提问，或者搜索比如 [Stack Overflow](https://stackoverflow.com/questions/tagged/vpn) 等网站。
+--->
+
+**问题描述**
+使用清楚简明的语言描述这个 bug。
+
+**重现步骤**
+重现该 bug 的步骤：
+
+1. ...
+2. ...
+
+**期待的正确结果**
+简要地描述你期望的正确结果。
+
+**日志**
+[检查日志及 VPN 状态](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#检查日志及-vpn-状态)，并添加错误日志以帮助解释该问题（如果适用）。
+
+**服务器信息（请填写以下信息）**
+- 操作系统: [比如 Debian 11]
+- 服务提供商（如果适用）: [比如 GCP, AWS]
+
+**客户端信息（请填写以下信息）**
+- 设备: [比如 iPhone 12]
+- 操作系统: [比如 iOS 15]
+- VPN 模式: [IPsec/L2TP, IPsec/XAuth ("Cisco IPsec") 或 IKEv2]
+
+**其它信息**
+添加关于该 bug 的其它信息。

.github/ISSUE_TEMPLATE/20-enhancement-request.md

@@ -0,0 +1,26 @@
+---
+name: Enhancement request
+about: Suggest an improvement for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Checklist**
+
+- [ ] I searched existing [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue), and did not find a similar enhancement request
+- [ ] This enhancement request is about the VPN setup scripts, and not IPsec VPN itself
+- [ ] I read the [README](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md)
+- [ ] I read the [Important notes](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#important-notes)
+- [ ] I followed instructions to [configure VPN clients](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README.md#next-steps)
+- [ ] I checked [IKEv1 troubleshooting](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#ikev1-troubleshooting), [IKEv2 troubleshooting](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/ikev2-howto.md#ikev2-troubleshooting) and [VPN status](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients.md#check-logs-and-vpn-status)
+
+**Describe the enhancement request**
+A clear and concise description of your enhancement request.
+
+**Is your enhancement request related to a problem? Please describe.**
+(If applicable) A clear and concise description of what the problem is.
+
+**Additional context**
+Add any other context about the enhancement request here.

.github/ISSUE_TEMPLATE/30-enhancement-request-zh.md

@@ -0,0 +1,26 @@
+---
+name: 改进建议
+about: 请使用这个模板来提交改进建议
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**任务列表**
+
+- [ ] 我搜索了已有的 [Issues](https://github.com/hwdsl2/setup-ipsec-vpn/issues?q=is%3Aissue)，没有找到类似的改进建议
+- [ ] 这个改进建议是关于 VPN 安装脚本，而不是 IPsec VPN 本身
+- [ ] 我已阅读 [自述文件](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md)
+- [ ] 我已阅读 [重要提示](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#重要提示)
+- [ ] 我已按照说明 [配置 VPN 客户端](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/README-zh.md#下一步)
+- [ ] 我检查了 [IKEv1 故障排除](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#ikev1-故障排除)，[IKEv2 故障排除](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/ikev2-howto-zh.md#ikev2-故障排除) 以及 [VPN 状态](https://github.com/hwdsl2/setup-ipsec-vpn/blob/master/docs/clients-zh.md#检查日志及-vpn-状态)
+
+**描述改进建议**
+使用清楚简明的语言描述你的改进建议。
+
+**你的改进建议与遇到的问题有关吗？请描述。**
+（如果适用）清楚，简洁地说明问题所在。
+
+**其它信息**
+添加关于该改进建议的其它信息。

.github/workflows/check_urls.yml

@@ -0,0 +1,108 @@
+#
+# Copyright (C) 2020-2024 Lin Song <[email protected]>
+#
+# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+# Unported License: http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Attribution required: please include my name in any derivative and let me
+# know how you have improved it!
+
+name: check_urls
+
+on: workflow_call
+
+jobs:
+  check_urls:
+    runs-on: ubuntu-22.04
+    if: github.repository_owner == 'hwdsl2'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Check
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          mkdir workdir
+          cd workdir
+          set -ex
+
+          export DEBIAN_FRONTEND=noninteractive
+          sudo apt-get -yqq update
+          sudo apt-get -yqq install wget
+
+          wg="wget -t 3 -T 30 -nv -O"
+          sl="sleep 1"
+          gi="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master"
+          gh="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
+
+          $wg vpnsetup.sh          "$gi/vpnsetup.sh"; $sl
+          $wg vpnsetup_centos.sh   "$gi/vpnsetup_centos.sh"; $sl
+          $wg vpnsetup_amzn.sh     "$gi/vpnsetup_amzn.sh"; $sl
+          $wg vpnsetup_ubuntu.sh   "$gi/vpnsetup_ubuntu.sh"; $sl
+          $wg vpnsetup_alpine.sh   "$gi/vpnsetup_alpine.sh"; $sl
+          $wg ikev2setup.sh        "$gi/extras/ikev2setup.sh"; $sl
+          $wg vpnupgrade.sh        "$gi/extras/vpnupgrade.sh"; $sl
+          $wg vpnupgrade_centos.sh "$gi/extras/vpnupgrade_centos.sh"; $sl
+          $wg vpnupgrade_amzn.sh   "$gi/extras/vpnupgrade_amzn.sh"; $sl
+          $wg vpnupgrade_ubuntu.sh "$gi/extras/vpnupgrade_ubuntu.sh"; $sl
+          $wg vpnupgrade_alpine.sh "$gi/extras/vpnupgrade_alpine.sh"; $sl
+          $wg vpnuninstall.sh      "$gi/extras/vpnuninstall.sh"; $sl
+          $wg add_vpn_user.sh      "$gi/extras/add_vpn_user.sh"; $sl
+          $wg del_vpn_user.sh      "$gi/extras/del_vpn_user.sh"; $sl
+          $wg update_vpn_users.sh  "$gi/extras/update_vpn_users.sh"; $sl
+          $wg ikev2changeaddr.sh   "$gi/extras/ikev2changeaddr.sh"; $sl
+          $wg ikev2onlymode.sh     "$gi/extras/ikev2onlymode.sh"; $sl
+
+          $wg vpnsetup2.sh          "$gh/vpnsetup.sh"; $sl
+          $wg vpnsetup_centos2.sh   "$gh/vpnsetup_centos.sh"; $sl
+          $wg vpnsetup_amzn2.sh     "$gh/vpnsetup_amzn.sh"; $sl
+          $wg vpnsetup_ubuntu2.sh   "$gh/vpnsetup_ubuntu.sh"; $sl
+          $wg vpnsetup_alpine2.sh   "$gh/vpnsetup_alpine.sh"; $sl
+          $wg ikev2setup2.sh        "$gh/extras/ikev2setup.sh"; $sl
+          $wg vpnupgrade2.sh        "$gh/extras/vpnupgrade.sh"; $sl
+          $wg vpnupgrade_centos2.sh "$gh/extras/vpnupgrade_centos.sh"; $sl
+          $wg vpnupgrade_amzn2.sh   "$gh/extras/vpnupgrade_amzn.sh"; $sl
+          $wg vpnupgrade_ubuntu2.sh "$gh/extras/vpnupgrade_ubuntu.sh"; $sl
+          $wg vpnupgrade_alpine2.sh "$gh/extras/vpnupgrade_alpine.sh"; $sl
+          $wg vpnuninstall2.sh      "$gh/extras/vpnuninstall.sh"; $sl
+          $wg add_vpn_user2.sh      "$gh/extras/add_vpn_user.sh"; $sl
+          $wg del_vpn_user2.sh      "$gh/extras/del_vpn_user.sh"; $sl
+          $wg update_vpn_users2.sh  "$gh/extras/update_vpn_users.sh"; $sl
+          $wg ikev2changeaddr2.sh   "$gh/extras/ikev2changeaddr.sh"; $sl
+          $wg ikev2onlymode2.sh     "$gh/extras/ikev2onlymode.sh"
+
+          diff vpnsetup.sh          ../vpnsetup.sh
+          diff vpnsetup_centos.sh   ../vpnsetup_centos.sh
+          diff vpnsetup_amzn.sh     ../vpnsetup_amzn.sh
+          diff vpnsetup_ubuntu.sh   ../vpnsetup_ubuntu.sh
+          diff vpnsetup_alpine.sh   ../vpnsetup_alpine.sh
+          diff ikev2setup.sh        ../extras/ikev2setup.sh
+          diff vpnupgrade.sh        ../extras/vpnupgrade.sh
+          diff vpnupgrade_centos.sh ../extras/vpnupgrade_centos.sh
+          diff vpnupgrade_amzn.sh   ../extras/vpnupgrade_amzn.sh
+          diff vpnupgrade_ubuntu.sh ../extras/vpnupgrade_ubuntu.sh
+          diff vpnupgrade_alpine.sh ../extras/vpnupgrade_alpine.sh
+          diff vpnuninstall.sh      ../extras/vpnuninstall.sh
+          diff add_vpn_user.sh      ../extras/add_vpn_user.sh
+          diff del_vpn_user.sh      ../extras/del_vpn_user.sh
+          diff update_vpn_users.sh  ../extras/update_vpn_users.sh
+          diff ikev2changeaddr.sh   ../extras/ikev2changeaddr.sh
+          diff ikev2onlymode.sh     ../extras/ikev2onlymode.sh
+
+          diff vpnsetup2.sh          ../vpnsetup.sh
+          diff vpnsetup_centos2.sh   ../vpnsetup_centos.sh
+          diff vpnsetup_amzn2.sh     ../vpnsetup_amzn.sh
+          diff vpnsetup_ubuntu2.sh   ../vpnsetup_ubuntu.sh
+          diff vpnsetup_alpine2.sh   ../vpnsetup_alpine.sh
+          diff ikev2setup2.sh        ../extras/ikev2setup.sh
+          diff vpnupgrade2.sh        ../extras/vpnupgrade.sh
+          diff vpnupgrade_centos2.sh ../extras/vpnupgrade_centos.sh
+          diff vpnupgrade_amzn2.sh   ../extras/vpnupgrade_amzn.sh
+          diff vpnupgrade_ubuntu2.sh ../extras/vpnupgrade_ubuntu.sh
+          diff vpnupgrade_alpine2.sh ../extras/vpnupgrade_alpine.sh
+          diff vpnuninstall2.sh      ../extras/vpnuninstall.sh
+          diff add_vpn_user2.sh      ../extras/add_vpn_user.sh
+          diff del_vpn_user2.sh      ../extras/del_vpn_user.sh
+          diff update_vpn_users2.sh  ../extras/update_vpn_users.sh
+          diff ikev2changeaddr2.sh   ../extras/ikev2changeaddr.sh
+          diff ikev2onlymode2.sh     ../extras/ikev2onlymode.sh

.github/workflows/cron.yml

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2020-2024 Lin Song <[email protected]>
+#
+# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+# Unported License: http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Attribution required: please include my name in any derivative and let me
+# know how you have improved it!
+
+name: build cron
+
+on:
+  schedule:
+    - cron: '25 2 * * 0,4'
+
+jobs:
+  check_urls:
+    if: github.repository_owner == 'hwdsl2'
+    uses: ./.github/workflows/check_urls.yml
+
+  test_set_2:
+    needs: check_urls
+    uses: ./.github/workflows/test_set_2.yml

.github/workflows/main.yml

@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2020-2024 Lin Song <[email protected]>
+#
+# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+# Unported License: http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Attribution required: please include my name in any derivative and let me
+# know how you have improved it!
+
+name: build
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - '**.sh'
+      - '.github/workflows/main.yml'
+      - '.github/workflows/shellcheck.yml'
+      - '.github/workflows/test_set_2.yml'
+
+jobs:
+  shellcheck:
+    if: github.repository_owner == 'hwdsl2'
+    uses: ./.github/workflows/shellcheck.yml
+
+  test_set_2:
+    needs: shellcheck
+    uses: ./.github/workflows/test_set_2.yml

.github/workflows/shellcheck.yml

@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2020-2024 Lin Song <[email protected]>
+#
+# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+# Unported License: http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Attribution required: please include my name in any derivative and let me
+# know how you have improved it!
+
+name: shellcheck
+
+on: workflow_call
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-22.04
+    if: github.repository_owner == 'hwdsl2'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Check
+        run: |
+          if [ ! -x /usr/bin/shellcheck ]; then
+            export DEBIAN_FRONTEND=noninteractive
+            sudo apt-get -yqq update
+            sudo apt-get -yqq install shellcheck
+          fi
+
+          cd "$GITHUB_WORKSPACE"
+          pwd
+          ls -ld vpnsetup.sh
+
+          export SHELLCHECK_OPTS="-e SC1090,SC1091"
+          shellcheck --version
+          shopt -s globstar
+          ls -ld -- **/*.sh
+          shellcheck **/*.sh