From 5ddac4b3b471d1f525d9d1ea431a87d114ae9aa9 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Fri, 15 Nov 2024 15:19:26 +0100 Subject: [PATCH] fix links to docs, add NOTICE Signed-off-by: Nicola Murino --- .github/workflows/development.yml | 1 + .github/workflows/release.yml | 8 ++++++-- pkgs/build.sh | 6 ++++++ pkgs/debian/copyright | 17 ++++++++++++++++- windows-installer/README.txt | 2 +- windows-installer/sftpgo.iss | 9 +++------ 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 633d6e8e..0cd5fff3 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -135,6 +135,7 @@ jobs: copy .\sftpgo.json .\output copy .\sftpgo.db .\output copy .\LICENSE .\output\LICENSE.txt + copy .\NOTICE .\output\NOTICE.txt mkdir output\templates xcopy .\templates .\output\templates\ /E mkdir output\static diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62f58a51..901a1d4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,8 +113,9 @@ jobs: mkdir -p output/{init,sqlite,bash_completion,zsh_completion} echo "For documentation please take a look here:" > output/README.txt echo "" >> output/README.txt - echo "https://github.com/drakkan/sftpgo/blob/${SFTPGO_VERSION}/README.md" >> output/README.txt + echo "https://docs.sftpgo.com" >> output/README.txt cp LICENSE output/ + cp NOTICE output/ cp sftpgo output/ cp sftpgo.json output/ cp sftpgo.db output/sqlite/ @@ -145,6 +146,7 @@ jobs: copy .\sftpgo.json .\output copy .\sftpgo.db .\output copy .\LICENSE .\output\LICENSE.txt + copy .\NOTICE .\output\NOTICE.txt mkdir output\templates xcopy .\templates .\output\templates\ /E mkdir output\static @@ -180,7 +182,6 @@ jobs: certutil -delstore MY "Nicola Murino" env: SFTPGO_ISS_VERSION: ${{ steps.get_version.outputs.VERSION }} - SFTPGO_ISS_DOC_URL: https://github.com/drakkan/sftpgo/blob/${{ steps.get_version.outputs.VERSION }}/README.md CERT_DATA: ${{ secrets.CERT_DATA }} CERT_PASS: ${{ secrets.CERT_PASS }} @@ -197,6 +198,7 @@ jobs: (Get-Content .\win-portable\sftpgo.json).replace('"sqlite"', '"bolt"') | Set-Content .\win-portable\sftpgo.json copy .\output\sftpgo.db .\win-portable copy .\LICENSE .\win-portable\LICENSE.txt + copy .\NOTICE .\win-portable\NOTICE.txt mkdir win-portable\templates xcopy .\templates .\win-portable\templates\ /E mkdir win-portable\static @@ -319,6 +321,7 @@ jobs: echo "" >> output/README.txt echo "https://github.com/drakkan/sftpgo/blob/${SFTPGO_VERSION}/README.md" >> output/README.txt cp LICENSE output/ + cp NOTICE output/ cp sftpgo.json output/ cp -r templates output/ cp -r static output/ @@ -368,6 +371,7 @@ jobs: echo "" >> output/README.txt echo "https://github.com/drakkan/sftpgo/blob/${{ steps.get_version.outputs.SFTPGO_VERSION }}/README.md" >> output/README.txt cp LICENSE output/ + cp NOTICE output/ cp sftpgo.json output/ cp -r templates output/ cp -r static output/ diff --git a/pkgs/build.sh b/pkgs/build.sh index e4217dfe..2be7050a 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -83,6 +83,12 @@ contents: - src: "${BASE_DIR}/openapi/*" dst: "/usr/share/sftpgo/openapi" + - src: "${BASE_DIR}/LICENSE" + dst: "/usr/share/licenses/sftpgo/LICENSE" + + - src: "${BASE_DIR}/NOTICE" + dst: "/usr/share/licenses/sftpgo/NOTICE" + - src: "./sftpgo.json" dst: "/etc/sftpgo/sftpgo.json" type: "config|noreplace" diff --git a/pkgs/debian/copyright b/pkgs/debian/copyright index 2126e59a..0ad8bfc9 100644 --- a/pkgs/debian/copyright +++ b/pkgs/debian/copyright @@ -4,7 +4,7 @@ Source: https://github.com/drakkan/sftpgo Files: * Copyright: 2019 Nicola Murino -License: AGPL-3 +License: AGPL-3 with additional terms License: AGPL-3 GNU AFFERO GENERAL PUBLIC LICENSE @@ -668,3 +668,18 @@ specific requirements. if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . + +ADDITIONAL TERMS + +Additional terms under GNU AGPL version 3 section 7.3(b) and 13.1: + +If you have included SFTPGo so that it is offered through any network +interactions, including by means of an external user interface, or +any other integration, even without modifying its source code and then +SFTPGo is partially, fully or optionally configured via your frontend, +you must provide reasonable but clear attribution to the SFTPGo project +and its author(s), not imply any endorsement by or affiliation with the +SFTPGo project, and you must prominently offer all users interacting +with it remotely through a computer network an opportunity to receive +the Corresponding Source of the SFTPGo version you include by providing +a link to the Corresponding Source in the SFTPGo source code repository. diff --git a/windows-installer/README.txt b/windows-installer/README.txt index 69855a3a..eb3cdcf5 100644 --- a/windows-installer/README.txt +++ b/windows-installer/README.txt @@ -32,7 +32,7 @@ You can simply replace the configuration file with the default one after updatin Documentation: -https://sftpgo.github.io/ +https://docs.sftpgo.com/ Commercial support: diff --git a/windows-installer/sftpgo.iss b/windows-installer/sftpgo.iss index 34fd7dce..ab952a98 100644 --- a/windows-installer/sftpgo.iss +++ b/windows-installer/sftpgo.iss @@ -17,13 +17,9 @@ #define MyAppArch64 "x64" #define MySetupName "sftpgo_windows_x86_64" #endif -#define MyAppURL "https://github.com/drakkan/sftpgo" +#define MyAppURL "https://sftpgo.com" #define MyVersionInfo StringChange(MyAppVersion,"v","") -#if GetEnv("SFTPGO_ISS_DOC_URL") != "" - #define DocURL GetEnv("SFTPGO_ISS_DOC_URL") -#else - #define DocURL "https://github.com/drakkan/sftpgo/blob/main/README.md" -#endif +#define DocURL "https://docs.sftpgo.com" #define MyAppExeName "sftpgo.exe" #define MyAppDir "..\output" #define MyOutputDir ".." @@ -63,6 +59,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Source: "{#MyAppDir}\sftpgo.exe"; DestDir: "{app}"; Flags: ignoreversion signonce Source: "{#MyAppDir}\sftpgo.db"; DestDir: "{commonappdata}\{#MyAppName}"; Flags: onlyifdoesntexist uninsneveruninstall Source: "{#MyAppDir}\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#MyAppDir}\NOTICE.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "{#MyAppDir}\sftpgo.json"; DestDir: "{commonappdata}\{#MyAppName}"; Flags: onlyifdoesntexist uninsneveruninstall Source: "{#MyAppDir}\sftpgo.json"; DestDir: "{commonappdata}\{#MyAppName}"; DestName: "sftpgo_default.json"; Flags: ignoreversion Source: "{#MyAppDir}\templates\*"; DestDir: "{commonappdata}\{#MyAppName}\templates"; Flags: ignoreversion recursesubdirs createallsubdirs