From 523969261276a12df580f7c8e83f2b89524b9e46 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 3 Mar 2015 00:11:18 +0100 Subject: [PATCH] fix nginx conf dir --- docker-compose.yml | 7 +++---- .../{nginx-app.conf => nginx/sites-enabled/app.conf} | 0 2 files changed, 3 insertions(+), 4 deletions(-) rename examples/deploy/{nginx-app.conf => nginx/sites-enabled/app.conf} (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 6444ccc..dc56396 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,8 @@ data: image: tianon/true volumes: - /var/lib/postgresql - - + + db: image: postgres volumes_from: @@ -14,7 +14,7 @@ nginx: ports: - "8080:80" volumes: - - ./examples/deploy/nginx-app.conf:/etc/nginx/sites-enabled/ + - ./examples/deploy/nginx/sites-enabled:/etc/nginx/sites-enabled - /media links: - app @@ -26,4 +26,3 @@ app: command: uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini:local ports: - "8000:8000" - diff --git a/examples/deploy/nginx-app.conf b/examples/deploy/nginx/sites-enabled/app.conf similarity index 100% rename from examples/deploy/nginx-app.conf rename to examples/deploy/nginx/sites-enabled/app.conf -- 2.39.5