From 61bc0065f9b6ab0d836a578f378909a79630d9f4 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Wed, 15 May 2024 21:25:42 +0200 Subject: [PATCH] back to development Signed-off-by: Nicola Murino --- internal/version/version.go | 2 +- openapi/openapi.yaml | 2 +- pkgs/choco/sftpgo.nuspec | 10 +++++----- pkgs/choco/tools/ChocolateyInstall.ps1 | 6 ++++-- pkgs/debian/changelog | 6 ++++++ pkgs/debian/patches/config.diff | 8 ++++---- windows-installer/README.txt | 12 +++++------- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/internal/version/version.go b/internal/version/version.go index d0c46d01..7036af2b 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -18,7 +18,7 @@ package version import "strings" const ( - version = "2.6.0" + version = "2.6.99-dev" appName = "SFTPGo" ) diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index 94c1fbb6..952ede46 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -29,7 +29,7 @@ info: SFTPGo supports groups to simplify the administration of multiple accounts by letting you assign settings once to a group, instead of multiple times to each individual user. The SFTPGo WebClient allows end users to change their credentials, browse and manage their files in the browser and setup two-factor authentication which works with Authy, Google Authenticator and other compatible apps. From the WebClient each authorized user can also create HTTP/S links to externally share files and folders securely, by setting limits to the number of downloads/uploads, protecting the share with a password, limiting access by source IP address, setting an automatic expiration date. - version: 2.6.0 + version: 2.6.99-dev contact: name: API support url: 'https://github.com/drakkan/sftpgo' diff --git a/pkgs/choco/sftpgo.nuspec b/pkgs/choco/sftpgo.nuspec index 854d3603..759cda67 100644 --- a/pkgs/choco/sftpgo.nuspec +++ b/pkgs/choco/sftpgo.nuspec @@ -3,17 +3,17 @@ sftpgo - 2.5.6 + 2.6.0 https://github.com/drakkan/sftpgo/tree/main/pkgs/choco asheroto SFTPGo Nicola Murino https://github.com/drakkan/sftpgo - https://cdn.statically.io/gh/drakkan/sftpgo/v2.5.6/static/img/logo.png + https://cdn.statically.io/gh/drakkan/sftpgo/v2.6.0/static/img/logo.png https://github.com/drakkan/sftpgo/blob/main/LICENSE false https://github.com/drakkan/sftpgo - https://github.com/drakkan/sftpgo/tree/v2.5.6/docs + https://sftpgo.github.io/2.6/ https://github.com/drakkan/sftpgo/issues sftp sftp-server ftp webdav s3 azure-blob google-cloud-storage cloud-storage scp data-at-rest-encryption multi-factor-authentication multi-step-authentication Full-featured and highly configurable file transfer server: SFTP, HTTP/S,FTP/S, WebDAV. @@ -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/). - https://github.com/drakkan/sftpgo/releases/tag/v2.5.6 +* After the first installation please take a look at the [Getting Started Guide](https://sftpgo.github.io/2.6/initial-configuration/). + https://github.com/drakkan/sftpgo/releases/tag/v2.6.0 diff --git a/pkgs/choco/tools/ChocolateyInstall.ps1 b/pkgs/choco/tools/ChocolateyInstall.ps1 index fa5fd930..730814d9 100644 --- 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 "---------------------------" \ No newline at end of file diff --git a/pkgs/debian/changelog b/pkgs/debian/changelog index 9a30f129..d8dc2b34 100644 --- 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 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 index 8f9fbcdb..9619ef25 100644 --- 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 index 8ef2245b..69855a3a 100644 --- 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