From 356a5bd130450341d92f882ac34e80c53271b2c7 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Mon, 29 Mar 2021 15:05:45 -0500 Subject: [PATCH] Update docs --- .github/workflows/cron.yml | 9 +++++++++ .github/workflows/main.yml | 9 +++++++++ LICENSE.md | 9 +++++++-- azure/README-zh.md | 2 +- azure/README.md | 2 +- docs/clients-xauth-zh.md | 2 +- docs/clients-xauth.md | 2 +- docs/clients-zh.md | 2 +- docs/clients.md | 2 +- docs/ikev2-howto-zh.md | 8 ++++++++ docs/ikev2-howto.md | 8 ++++++++ docs/manage-users-zh.md | 8 ++++++++ docs/manage-users.md | 8 ++++++++ docs/uninstall-zh.md | 8 ++++++++ docs/uninstall.md | 8 ++++++++ 15 files changed, 79 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 9b60e75..3d87ad4 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -1,3 +1,12 @@ +# +# Copyright (C) 2020-2021 Lin Song +# +# 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: vpn test cron on: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43feceb..4ce7fba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,3 +1,12 @@ +# +# Copyright (C) 2020-2021 Lin Song +# +# 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: vpn test on: diff --git a/LICENSE.md b/LICENSE.md index b63ae6f..c0b0c46 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,8 +1,13 @@ ### Creative Commons Attribution-ShareAlike 3.0 Unported License Link to license summary: https://creativecommons.org/licenses/by-sa/3.0/ -Copyright (C) 2014-2021 Lin Song -Based on the work of Thomas Sarlandie (Copyright 2012) +Copyright (C) 2014-2021 [Lin Song](https://www.linkedin.com/in/linsongui) +Based on [the work of Thomas Sarlandie](https://github.com/sarfata/voodooprivacy) (Copyright 2012) + +See the [aws/](aws/) and [azure/](azure/) subfolders for their respective authors. + +The following four files (only) are licensed under the GPL: +[clients.md](docs/clients.md), [clients-zh.md](docs/clients-zh.md), [clients-xauth.md](docs/clients-xauth.md) and [clients-xauth-zh.md](docs/clients-xauth-zh.md)

THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR diff --git a/azure/README-zh.md b/azure/README-zh.md index 516bacd..02e0820 100644 --- a/azure/README-zh.md +++ b/azure/README-zh.md @@ -25,7 +25,7 @@ ## 作者 版权所有 (C) 2016 [Daniel Falkner](https://github.com/derdanu) -版权所有 (C) 2017-2021 Lin Song +版权所有 (C) 2017-2021 [Lin Song](https://www.linkedin.com/in/linsongui) ## 屏幕截图 diff --git a/azure/README.md b/azure/README.md index 025e9f8..7f5bfdd 100644 --- a/azure/README.md +++ b/azure/README.md @@ -25,7 +25,7 @@ When the deployment finishes, Azure displays a notification. Next steps: [Config ## Authors Copyright (C) 2016 [Daniel Falkner](https://github.com/derdanu) -Copyright (C) 2017-2021 Lin Song +Copyright (C) 2017-2021 [Lin Song](https://www.linkedin.com/in/linsongui) ## Screenshot diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index 42e8530..7ec9a7b 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -137,7 +137,7 @@ VPN 连接成功后，你可以到 Lin Song 基于 Joshua Lund 的工作 (版权所有 2014-2016) 本程序为自由软件，在自由软件联盟发布的 GNU 通用公共许可协议的约束下，你可以对其进行再发布及修改。协议版本为第三版或（随你）更新的版本。 diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index a08e04a..e624b08 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -137,7 +137,7 @@ This document was adapted from the Lin Song Based on the work of Joshua Lund (Copyright 2014-2016) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/docs/clients-zh.md b/docs/clients-zh.md index e91a7a8..7501a2e 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -596,7 +596,7 @@ strongswan down myvpn 注： 这个协议仅适用于本文档。 -版权所有 (C) 2016-2021 Lin Song +版权所有 (C) 2016-2021 Lin Song 基于 Joshua Lund 的工作 (版权所有 2014-2016) 本程序为自由软件，在自由软件联盟发布的 GNU 通用公共许可协议的约束下，你可以对其进行再发布及修改。协议版本为第三版或（随你）更新的版本。 diff --git a/docs/clients.md b/docs/clients.md index 85c07db..4011101 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -594,7 +594,7 @@ This document was adapted from the Lin Song Based on the work of Joshua Lund (Copyright 2014-2016) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/docs/ikev2-howto-zh.md b/docs/ikev2-howto-zh.md index 16e8cdc..47af3f0 100644 --- a/docs/ikev2-howto-zh.md +++ b/docs/ikev2-howto-zh.md @@ -770,3 +770,11 @@ apt-get -y install "./libnss3_3.49.1-1ubuntu1.5_amd64.deb" \ * https://wiki.strongswan.org/projects/strongswan/wiki/AndroidVpnClient * https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/tools/NSS_Tools_certutil * https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/tools/NSS_Tools_crlutil + +## 授权协议 + +版权所有 (C) 2016-2021 Lin Song + +Creative Commons License +这个项目是以 知识共享署名-相同方式共享3.0 许可协议授权。 +必须署名： 请包括我的名字在任何衍生产品，并且让我知道你是如何改善它的！ diff --git a/docs/ikev2-howto.md b/docs/ikev2-howto.md index 9798238..806029c 100644 --- a/docs/ikev2-howto.md +++ b/docs/ikev2-howto.md @@ -772,3 +772,11 @@ To manually remove IKEv2 from the VPN server, but keep the [IPsec/L2TP](clients. * https://wiki.strongswan.org/projects/strongswan/wiki/AndroidVpnClient * https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/tools/NSS_Tools_certutil * https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/tools/NSS_Tools_crlutil + +## License + +Copyright (C) 2016-2021 Lin Song + +Creative Commons License +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License +Attribution required: please include my name in any derivative and let me know how you have improved it! diff --git a/docs/manage-users-zh.md b/docs/manage-users-zh.md index be5e6bf..48ae153 100644 --- a/docs/manage-users-zh.md +++ b/docs/manage-users-zh.md @@ -138,3 +138,11 @@ sh update_vpn_users.sh # 将你的密码用 '单引号' 括起来 openssl passwd -1 '密码1' ``` + +## 授权协议 + +版权所有 (C) 2016-2021 Lin Song + +Creative Commons License +这个项目是以 知识共享署名-相同方式共享3.0 许可协议授权。 +必须署名： 请包括我的名字在任何衍生产品，并且让我知道你是如何改善它的！ diff --git a/docs/manage-users.md b/docs/manage-users.md index 49008d8..184f711 100644 --- a/docs/manage-users.md +++ b/docs/manage-users.md @@ -138,3 +138,11 @@ Passwords in this file are salted and hashed. This step can be done using e.g. t # Put your password inside 'single quotes' openssl passwd -1 'password1' ``` + +## License + +Copyright (C) 2016-2021 Lin Song + +Creative Commons License +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License +Attribution required: please include my name in any derivative and let me know how you have improved it! diff --git a/docs/uninstall-zh.md b/docs/uninstall-zh.md index 5b3390c..d2784de 100644 --- a/docs/uninstall-zh.md +++ b/docs/uninstall-zh.md @@ -77,3 +77,11 @@ rm -rf /etc/ipsec.d /etc/xl2tpd ## 完成后 重启你的服务器。 + +## 授权协议 + +版权所有 (C) 2016-2021 Lin Song + +Creative Commons License +这个项目是以 知识共享署名-相同方式共享3.0 许可协议授权。 +必须署名： 请包括我的名字在任何衍生产品，并且让我知道你是如何改善它的！ diff --git a/docs/uninstall.md b/docs/uninstall.md index 778968e..ddbed10 100644 --- a/docs/uninstall.md +++ b/docs/uninstall.md @@ -77,3 +77,11 @@ rm -rf /etc/ipsec.d /etc/xl2tpd ## When finished Reboot your server. + +## License + +Copyright (C) 2016-2021 Lin Song + +Creative Commons License +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License +Attribution required: please include my name in any derivative and let me know how you have improved it!