back to development

Signed-off-by: Nicola Murino <[email protected]>
drakkan · May 15, 2024 · ac43862 · ac43862
1 parent 19e9857
commit ac43862
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/pkgs/choco/sftpgo.nuspec b/pkgs/choco/sftpgo.nuspec
@@ -3,17 +3,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
 	<metadata>
 		<id>sftpgo</id>
-		<version>2.5.6</version>
+		<version>2.6.0</version>
 		<packageSourceUrl>https://github.com/drakkan/sftpgo/tree/main/pkgs/choco</packageSourceUrl>
 		<owners>asheroto</owners>
 		<title>SFTPGo</title>
 		<authors>Nicola Murino</authors>
 		<projectUrl>https://github.com/drakkan/sftpgo</projectUrl>
-		<iconUrl>https://cdn.statically.io/gh/drakkan/sftpgo/v2.5.6/static/img/logo.png</iconUrl>
+		<iconUrl>https://cdn.statically.io/gh/drakkan/sftpgo/v2.6.0/static/img/logo.png</iconUrl>
 		<licenseUrl>https://github.com/drakkan/sftpgo/blob/main/LICENSE</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<projectSourceUrl>https://github.com/drakkan/sftpgo</projectSourceUrl>
-		<docsUrl>https://github.com/drakkan/sftpgo/tree/v2.5.6/docs</docsUrl>
+		<docsUrl>https://sftpgo.github.io/2.6/</docsUrl>
 		<bugTrackerUrl>https://github.com/drakkan/sftpgo/issues</bugTrackerUrl>
 		<tags>sftp sftp-server ftp webdav s3 azure-blob google-cloud-storage cloud-storage scp data-at-rest-encryption multi-factor-authentication multi-step-authentication</tags>
 		<summary>Full-featured and highly configurable file transfer server: SFTP, HTTP/S,FTP/S, WebDAV.</summary>
@@ -31,8 +31,8 @@ You can find more info [here](https://github.com/drakkan/sftpgo).
 ### Notes
 
 * This package installs SFTPGo as Windows Service.
-* After the first installation please take a look at the [Getting Started Guide](https://sftpgo.github.io/latest/initial-configuration/).</description>
-		<releaseNotes>https://github.com/drakkan/sftpgo/releases/tag/v2.5.6</releaseNotes>
+* After the first installation please take a look at the [Getting Started Guide](https://sftpgo.github.io/2.6/initial-configuration/).</description>
+		<releaseNotes>https://github.com/drakkan/sftpgo/releases/tag/v2.6.0</releaseNotes>
 	</metadata>
 	<files>
 		<file src="**" exclude="**\*.md;**\icon.png;**\icon.jpg;**\icon.svg" />

diff --git a/pkgs/choco/tools/ChocolateyInstall.ps1 b/pkgs/choco/tools/ChocolateyInstall.ps1
@@ -1,8 +1,8 @@
 $ErrorActionPreference  = 'Stop'
 $packageName    = 'sftpgo'
 $softwareName   = 'SFTPGo'
-$url            = 'https://github.com/drakkan/sftpgo/releases/download/v2.5.6/sftpgo_v2.5.6_windows_x86_64.exe'
-$checksum       = 'C20BB051D3EA2ACBF05231ECB94410D01648E15DE304CA6240D37FDC34007DBE'
+$url            = 'https://github.com/drakkan/sftpgo/releases/download/v2.6.0/sftpgo_v2.6.0_windows_x86_64.exe'
+$checksum       = '86846D6630E217D7391E7699E65377C0BD043234D30F5DD0D1361E7B816681FC'
 $silentArgs     = '/VERYSILENT'
 $validExitCodes = @(0)
 
@@ -48,5 +48,7 @@ Write-Output "General information (README) location:"
 Write-Output "`thttps://github.com/drakkan/sftpgo"
 Write-Output "Documentation location:"
 Write-Output "`thttps://sftpgo.github.io/"
+Write-Output "Commercial support:"
+Write-Output "`thttps://sftpgo.com/#pricing"
 Write-Output ""
 Write-Output "---------------------------"
diff --git a/pkgs/debian/changelog b/pkgs/debian/changelog
@@ -1,3 +1,9 @@
+sftpgo (2.6.0-1ppa1) bionic; urgency=medium
+
+  * New upstream release
+
+ -- Nicola Murino <[email protected]>  Wed, 15 May 2024 19:12:01 +0200
+
 sftpgo (2.5.6-1ppa1) bionic; urgency=medium
 
   * New upstream release

diff --git a/pkgs/debian/patches/config.diff b/pkgs/debian/patches/config.diff
@@ -2,7 +2,7 @@ Index: sftpgo/sftpgo.json
 ===================================================================
 --- sftpgo.orig/sftpgo.json
 +++ sftpgo/sftpgo.json
-@@ -57,7 +57,7 @@
+@@ -63,7 +63,7 @@
      "domains": [],
      "email": "",
      "key_type": "4096",
@@ -11,7 +11,7 @@ Index: sftpgo/sftpgo.json
      "ca_endpoint": "https://acme-v02.api.letsencrypt.org/directory",
      "renew_days": 30,
      "http01_challenge": {
-@@ -186,7 +186,7 @@
+@@ -194,7 +194,7 @@
    },
    "data_provider": {
      "driver": "sqlite",
@@ -20,7 +20,7 @@ Index: sftpgo/sftpgo.json
      "host": "",
      "port": 0,
      "username": "",
-@@ -202,7 +202,7 @@
+@@ -210,7 +210,7 @@
      "track_quota": 2,
      "delayed_quota_update": 0,
      "pool_size": 0,
@@ -29,7 +29,7 @@ Index: sftpgo/sftpgo.json
      "actions": {
        "execute_on": [],
        "execute_for": [],
-@@ -244,7 +244,7 @@
+@@ -252,7 +252,7 @@
        "port": 0,
        "proto": "http"
      },

diff --git a/windows-installer/README.txt b/windows-installer/README.txt
@@ -30,17 +30,15 @@ the env.d directory.
 This eliminates the need to merge your changes with the default configuration file after each update.
 You can simply replace the configuration file with the default one after updating SFTPGo.
 
-https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md
+Documentation:
 
-Getting started guide:
+https://sftpgo.github.io/
 
-https://github.com/drakkan/sftpgo/blob/main/docs/howto/getting-started.md
+Commercial support:
 
-Step-to-step tutorials:
+https://sftpgo.com/#pricing
 
-https://github.com/drakkan/sftpgo/tree/main/docs/howto
-
-Source code and documentation:
+Source code:
 
 https://github.com/drakkan/sftpgo