From 222f0c735bb95920dcf18b7b781646f865ab32ad Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 23 Oct 2022 09:20:00 +0200 Subject: [PATCH] back to development Signed-off-by: Nicola Murino --- internal/version/version.go | 2 +- openapi/openapi.yaml | 2 +- pkgs/choco/sftpgo.nuspec | 8 +++---- pkgs/choco/tools/ChocolateyInstall.ps1 | 8 +++---- pkgs/debian/changelog | 6 +++++ pkgs/debian/patches/config.diff | 31 +++++++++----------------- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/internal/version/version.go b/internal/version/version.go index fbca671c..818575fc 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -17,7 +17,7 @@ package version import "strings" -const version = "2.4.0" +const version = "2.4.0-dev" var ( commit = "" diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index e2f3ad56..e2443445 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -27,7 +27,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.4.0 + version: 2.4.0-dev contact: name: API support url: 'https://github.com/drakkan/sftpgo' diff --git a/pkgs/choco/sftpgo.nuspec b/pkgs/choco/sftpgo.nuspec index 69fd9cc8..ec5bcbfa 100644 --- a/pkgs/choco/sftpgo.nuspec +++ b/pkgs/choco/sftpgo.nuspec @@ -3,17 +3,17 @@ sftpgo - 2.3.6 + 2.4.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.3.6/static/img/logo.png + https://cdn.statically.io/gh/drakkan/sftpgo/v2.4.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.3.6/docs + https://github.com/drakkan/sftpgo/tree/v2.4.0/docs 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 Fully featured and highly configurable SFTP server with optional HTTP/S,FTP/S and WebDAV support. @@ -32,7 +32,7 @@ You can find more info [here](https://github.com/drakkan/sftpgo). * This package installs SFTPGo as Windows Service. * After the first installation please take a look at the [Getting Started Guide](https://github.com/drakkan/sftpgo/blob/main/docs/howto/getting-started.md). - https://github.com/drakkan/sftpgo/releases/tag/v2.3.6 + https://github.com/drakkan/sftpgo/releases/tag/v2.4.0 diff --git a/pkgs/choco/tools/ChocolateyInstall.ps1 b/pkgs/choco/tools/ChocolateyInstall.ps1 index d5c74716..31ad1a0f 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.3.6/sftpgo_v2.3.6_windows_x86_64.exe' -$checksum = 'A0247EE43FECC7D54504D0638631FAEFB223EF00FD2B10EEE988A2CCC9A014EA' +$url = 'https://github.com/drakkan/sftpgo/releases/download/v2.4.0/sftpgo_v2.4.0_windows_x86_64.exe' +$checksum = 'D8503BF3C5F606C3445D1286C8C5CA54476EC751E2CE0D4EAAE5EB4903C09412' $silentArgs = '/VERYSILENT' $validExitCodes = @(0) @@ -47,8 +47,8 @@ Write-Output "" Write-Output "General information (README) location:" Write-Output "`thttps://github.com/drakkan/sftpgo" Write-Output "Getting started guide location:" -Write-Output "`thttps://github.com/drakkan/sftpgo/blob/v2.3.6/docs/howto/getting-started.md" +Write-Output "`thttps://github.com/drakkan/sftpgo/blob/v2.4.0/docs/howto/getting-started.md" Write-Output "Detailed information (docs folder) location:" -Write-Output "`thttps://github.com/drakkan/sftpgo/tree/v2.3.6/docs" +Write-Output "`thttps://github.com/drakkan/sftpgo/tree/v2.4.0/docs" Write-Output "" Write-Output "---------------------------" \ No newline at end of file diff --git a/pkgs/debian/changelog b/pkgs/debian/changelog index eeb2b52b..34af6fc4 100644 --- a/pkgs/debian/changelog +++ b/pkgs/debian/changelog @@ -1,3 +1,9 @@ +sftpgo (2.4.0-1ppa1) bionic; urgency=medium + + * New upstream release + + -- Nicola Murino Sun, 23 Oct 2022 07:40:29 +0200 + sftpgo (2.3.6-1ppa1) bionic; urgency=medium * New upstream release diff --git a/pkgs/debian/patches/config.diff b/pkgs/debian/patches/config.diff index 14c0fe5e..dc6f95f7 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 -@@ -58,7 +58,7 @@ +@@ -59,7 +59,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": { -@@ -180,7 +180,7 @@ +@@ -185,7 +185,7 @@ }, "data_provider": { "driver": "sqlite", @@ -20,7 +20,7 @@ Index: sftpgo/sftpgo.json "host": "", "port": 0, "username": "", -@@ -194,7 +194,7 @@ +@@ -201,7 +201,7 @@ "track_quota": 2, "delayed_quota_update": 0, "pool_size": 0, @@ -29,21 +29,12 @@ Index: sftpgo/sftpgo.json "actions": { "execute_on": [], "execute_for": [], -@@ -202,7 +202,7 @@ +@@ -243,7 +243,7 @@ + "port": 0, + "proto": "http" }, - "external_auth_hook": "", - "external_auth_scope": 0, -- "credentials_path": "credentials", -+ "credentials_path": "/var/lib/sftpgo/credentials", - "pre_login_hook": "", - "post_login_hook": "", - "post_login_scope": 0, -@@ -232,7 +232,7 @@ - "create_default_admin": false, - "naming_rules": 1, - "is_shared": 0, -- "backups_path": "backups", -+ "backups_path": "/srv/sftpgo/backups", - "auto_backup": { - "enabled": true, - "hour": "0", +- "backups_path": "backups" ++ "backups_path": "/srv/sftpgo/backups" + }, + "httpd": { + "bindings": [