From fc4f52b2da7aac6922077f97c65efcd4bf60e2c7 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 28 Apr 2019 16:11:57 -0500 Subject: [PATCH] re-orgs --- .dockerignore | 1 - docker-compose.yml | 2 +- .../FilterLists.postman_collection.json | 0 ops/nginx/{dev => }/conf.d/filterlists-api.conf | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename FilterLists.postman_collection.json => ops/FilterLists.postman_collection.json (100%) rename ops/nginx/{dev => }/conf.d/filterlists-api.conf (93%) diff --git a/.dockerignore b/.dockerignore index 31dc9509d..b8ee7703b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,7 +11,6 @@ codecov.yml docker-compose.yml docker-compose.*.yml *.DotSettings* -FilterLists.postman_collection.json LICENSE **/bin **/obj diff --git a/docker-compose.yml b/docker-compose.yml index 52a9194b0..37d25a815 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: networks: - reverse-proxy volumes: - - ./ops/nginx/dev/conf.d:/etc/nginx/conf.d:ro + - ./ops/nginx/conf.d:/etc/nginx/conf.d:ro filterlists-api: image: collinbarrett/filterlists.api diff --git a/FilterLists.postman_collection.json b/ops/FilterLists.postman_collection.json similarity index 100% rename from FilterLists.postman_collection.json rename to ops/FilterLists.postman_collection.json diff --git a/ops/nginx/dev/conf.d/filterlists-api.conf b/ops/nginx/conf.d/filterlists-api.conf similarity index 93% rename from ops/nginx/dev/conf.d/filterlists-api.conf rename to ops/nginx/conf.d/filterlists-api.conf index 75f64fc2d..7da027fcf 100644 --- a/ops/nginx/dev/conf.d/filterlists-api.conf +++ b/ops/nginx/conf.d/filterlists-api.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 80 default_server; location ^~ /api { rewrite ^/api/(.*)$ /$1 break;