[GNUnet-SVN] [taler-deployment] branch master updated: default.conf dockerized nginx

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new ad34690  default.conf dockerized nginx
ad34690 is described below

commit ad346901d72246285874ae27bb2052d6be257ffb
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jan 4 18:28:39 2017 +0100

    default.conf dockerized nginx
---
 docker/nginx/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 269f14e..5636699 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,5 +1,3 @@
 FROM nginx
 
-COPY ./proxy.conf /etc/nginx/sites-enabled/
-
-COPY ./nginx.conf /etc/nginx/
+COPY ./proxy.conf /etc/nginx/conf.d/default.conf

-- 
To stop receiving notification emails like this one, please contact
address@hidden