From f3cfb0a940fa1df1e7116e7c13ac537a7635daa1 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 1 Feb 2017 08:56:07 +1300 Subject: [PATCH 1/2] fix(cli): revert data/certs directories defaults to c:\data and c:\certs (#551) --- api/cli/defaults_windows.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/cli/defaults_windows.go b/api/cli/defaults_windows.go index 9e4be3a80..3a4106c74 100644 --- a/api/cli/defaults_windows.go +++ b/api/cli/defaults_windows.go @@ -2,11 +2,11 @@ package cli const ( defaultBindAddress = ":9000" - defaultDataDirectory = "C:\\ProgramData\\Portainer" + defaultDataDirectory = "C:\\data" defaultAssetsDirectory = "." defaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json" defaultTLSVerify = "false" - defaultTLSCACertPath = "C:\\ProgramData\\Portainer\\certs\\ca.pem" - defaultTLSCertPath = "C:\\ProgramData\\Portainer\\certs\\cert.pem" - defaultTLSKeyPath = "C:\\ProgramData\\Portainer\\certs\\key.pem" + defaultTLSCACertPath = "C:\\certs\\ca.pem" + defaultTLSCertPath = "C:\\certs\\cert.pem" + defaultTLSKeyPath = "C:\\certs\\key.pem" ) From a97e7bbaae5824a5fecd16a450dca75a7e6ddff0 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 1 Feb 2017 11:02:05 +1300 Subject: [PATCH 2/2] chore(version): bump version number --- api/portainer.go | 2 +- app/app.js | 2 +- bower.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/portainer.go b/api/portainer.go index 0bd3fe6d8..6d928e1b2 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -119,7 +119,7 @@ type ( const ( // APIVersion is the version number of portainer API. - APIVersion = "1.11.2" + APIVersion = "1.11.3" ) const ( diff --git a/app/app.js b/app/app.js index 08d2de18a..3c563dd9e 100644 --- a/app/app.js +++ b/app/app.js @@ -568,4 +568,4 @@ angular.module('portainer', [ .constant('ENDPOINTS_ENDPOINT', 'api/endpoints') .constant('TEMPLATES_ENDPOINT', 'api/templates') .constant('PAGINATION_MAX_ITEMS', 10) - .constant('UI_VERSION', 'v1.11.2'); + .constant('UI_VERSION', 'v1.11.3'); diff --git a/bower.json b/bower.json index 11fe570e4..d69e8403e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "portainer", - "version": "1.11.2", + "version": "1.11.3", "homepage": "https://github.com/portainer/portainer", "authors": [ "Anthony Lapenna " diff --git a/package.json b/package.json index 5a08800ae..c1400d2c9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.11.2", + "version": "1.11.3", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git"