This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new cf70347 Allow CLI download from /cli in addition to /cli/go/download.
(#4258)
cf70347 is described below
commit cf70347c6c15944f4aa541805e502f48d89baedf
Author: rodric rabbah <[email protected]>
AuthorDate: Thu Feb 7 22:03:41 2019 -0500
Allow CLI download from /cli in addition to /cli/go/download. (#4258)
---
ansible/roles/nginx/templates/nginx.conf.j2 | 13 +++++++------
docs/cli.md | 3 +--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index a86593f..d351f84 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -115,18 +115,19 @@ http {
location /blackbox.tar.gz {
return 301
https://github.com/apache/incubator-openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
}
- # leaving this for a while for clients out there to update to the new
endpoint
- location /blackbox-0.1.0.tar.gz {
- return 301 /blackbox.tar.gz;
- }
location /OpenWhiskIOSStarterApp.zip {
return 301
https://github.com/apache/incubator-openwhisk-client-swift/releases/download/0.3.0/starterapp-0.3.0.zip;
}
- location /cli/go/download {
+ location /cli {
autoindex on;
- root /etc/nginx;
+ alias /etc/nginx/cli/go/download;
+ }
+
+ # this is here for backward compatibility
+ location /cli/go/download {
+ rewrite /cli/go/download(.*) /cli$1 permanent;
}
}
}
diff --git a/docs/cli.md b/docs/cli.md
index efe77b2..f969307 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -26,8 +26,7 @@ OpenWhisk offers a powerful command line interface that
allows complete manageme
- To download the CLI from an existing deployment, you will need to download
the CLI using the deployment's base URL.
A list of downloadable CLIs for various operating systems, and CPU
architectures can be obtained from the following
-location `{BASE URL}/cli/go/download`. The `{BASE URL}` is the OpenWhisk API
hostname or IP address
-(e.g., openwhisk.ng.bluemix.net).
+location `{BASE URL}/cli`. The `{BASE URL}` is the OpenWhisk API hostname or
IP address.
There are two required properties to configure in order to use the CLI:
