openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dra...@apache.org
Subject [incubator-openwhisk-devtools] branch master updated: update SSL config for NGINX (#46)
Date Tue, 01 Aug 2017 03:12:34 GMT
This is an automated email from the ASF dual-hosted git repository.

dragos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 28d1b48  update SSL config for NGINX (#46)
28d1b48 is described below

commit 28d1b4829fe040ce887a9439ce4e6b9378aff893
Author: ddragosd <ddragosd@gmail.com>
AuthorDate: Mon Jul 31 20:12:32 2017 -0700

    update SSL config for NGINX (#46)
---
 docker-compose/Makefile                                  | 8 ++++----
 docker-compose/apigateway/conf/whisk-docker-compose.conf | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 4f7d8d4..ce754c2 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -23,7 +23,7 @@ download:
 	if [ "$(PROJECT_HOME)" = "./openwhisk-master" ]; then \
 	    curl -O ./openwhisk-master.tar.gz -L https://api.github.com/repos/openwhisk/openwhisk/tarball/master
> ./openwhisk-master.tar.gz; \
 	    mkdir openwhisk-master; \
-	    tar -xvf ./openwhisk-master.tar.gz --strip 1 -C openwhisk-master; \
+	    tar -xf ./openwhisk-master.tar.gz --strip 1 -C openwhisk-master; \
 	else \
 	     echo "Skipping downloading the code from git as PROJECT_HOME is not default:" $(PROJECT_HOME);
\
 	fi
@@ -64,7 +64,7 @@ check-required-ports:
 .PHONY: setup
 setup:
 	mkdir -p ~/tmp/openwhisk/apigateway/ssl
-	cd $(PROJECT_HOME)/ansible/roles/nginx/files/ && ./genssl.sh $(DOCKER_HOST_IP)
+	cd $(PROJECT_HOME)/ansible/roles/nginx/files/ && ./genssl.sh $(DOCKER_HOST_IP) server
 	cp $(PROJECT_HOME)/ansible/roles/nginx/files/*.pem ~/tmp/openwhisk/apigateway/ssl
 	cp -r ./apigateway/* ~/tmp/openwhisk/apigateway/
 
@@ -74,7 +74,7 @@ restart: stop rm start-docker-compose
 .PHONY: restart-controller
 restart-controller:
 	DOCKER_COMPOSE_HOST=$(DOCKER_HOST_IP) DOCKER_REGISTRY=$(DOCKER_REGISTRY) DOCKER_IMAGE_PREFIX=$(DOCKER_IMAGE_PREFIX)
docker-compose --project-name openwhisk restart controller 2>&1 > ~/tmp/openwhisk/docker-compose.log
&
-	echo "waiting until the controller recognizes a healthy invoker ... "
+	echo "waiting for the invoker to be marked Healthy ... "
 	until (curl --silent http://$(DOCKER_HOST_IP):8888/invokers | grep "up"); do printf '.';
sleep 5; done
 
 .PHONY: start-docker-compose
@@ -98,7 +98,7 @@ init-couchdb:
 	# make sure the src files are in a shared folder for docker
 	mkdir -p ~/tmp/openwhisk
 	rm -rf ~/tmp/openwhisk/src
-	rsync -av $(PROJECT_HOME)/* ~/tmp/openwhisk/src --exclude .git --exclude build --exclude
tests
+	rsync -a $(PROJECT_HOME)/* ~/tmp/openwhisk/src --exclude .git --exclude build --exclude
tests
 	docker run --rm -v ~/tmp/openwhisk/src:/openwhisk -w /openwhisk/ansible \
 	    --network="host" -t \
 	    williamyeh/ansible:debian8  \
diff --git a/docker-compose/apigateway/conf/whisk-docker-compose.conf b/docker-compose/apigateway/conf/whisk-docker-compose.conf
index 945ab96..51857d6 100644
--- a/docker-compose/apigateway/conf/whisk-docker-compose.conf
+++ b/docker-compose/apigateway/conf/whisk-docker-compose.conf
@@ -12,8 +12,8 @@ server {
 
   ssl_session_cache    shared:SSL:1m;
   ssl_session_timeout  10m;
-  ssl_certificate      /etc/ssl/openwhisk-cert.pem;
-  ssl_certificate_key  /etc/ssl/openwhisk-key.pem;
+  ssl_certificate      /etc/ssl/openwhisk-server-cert.pem;
+  ssl_certificate_key  /etc/ssl/openwhisk-server-key.pem;
   ssl_verify_client off;
   ssl_protocols        TLSv1 TLSv1.1 TLSv1.2;
   ssl_ciphers RC4:HIGH:!aNULL:!MD5;
@@ -39,4 +39,3 @@ server {
   }
 
 }
-

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message