From 9bc2bd1d4485c1ef14f807ff6b2126def9b04325 Mon Sep 17 00:00:00 2001 From: RobinLinus Date: Tue, 14 Jul 2020 22:12:10 +0200 Subject: [PATCH] Cleanup root folder --- docker-compose.yml | 8 ++++---- fqdn.env => docker/fqdn.env | 0 .../nginx-with-openssl.Dockerfile | 0 {nginx => docker/nginx}/default.conf | 0 {openssl => docker/openssl}/create.sh | 0 {openssl => docker/openssl}/snapdropCA.cnf | 0 {openssl => docker/openssl}/snapdropCert.cnf | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename fqdn.env => docker/fqdn.env (100%) rename nginx-with-openssl.Dockerfile => docker/nginx-with-openssl.Dockerfile (100%) rename {nginx => docker/nginx}/default.conf (100%) rename {openssl => docker/openssl}/create.sh (100%) rename {openssl => docker/openssl}/snapdropCA.cnf (100%) rename {openssl => docker/openssl}/snapdropCert.cnf (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 4c7f67b..34286f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,12 +14,12 @@ services: image: "nginx-with-openssl" volumes: - ./client:/usr/share/nginx/html - - ./nginx/default.conf:/etc/nginx/conf.d/default.conf - - ./certs:/etc/ssl/certs - - ./openssl:/mnt/openssl + - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf + - ./docker/certs:/etc/ssl/certs + - ./docker/openssl:/mnt/openssl ports: - "8080:80" - "443:443" - env_file: fqdn.env + env_file: ./docker/fqdn.env entrypoint: /mnt/openssl/create.sh command: ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/fqdn.env b/docker/fqdn.env similarity index 100% rename from fqdn.env rename to docker/fqdn.env diff --git a/nginx-with-openssl.Dockerfile b/docker/nginx-with-openssl.Dockerfile similarity index 100% rename from nginx-with-openssl.Dockerfile rename to docker/nginx-with-openssl.Dockerfile diff --git a/nginx/default.conf b/docker/nginx/default.conf similarity index 100% rename from nginx/default.conf rename to docker/nginx/default.conf diff --git a/openssl/create.sh b/docker/openssl/create.sh similarity index 100% rename from openssl/create.sh rename to docker/openssl/create.sh diff --git a/openssl/snapdropCA.cnf b/docker/openssl/snapdropCA.cnf similarity index 100% rename from openssl/snapdropCA.cnf rename to docker/openssl/snapdropCA.cnf diff --git a/openssl/snapdropCert.cnf b/docker/openssl/snapdropCert.cnf similarity index 100% rename from openssl/snapdropCert.cnf rename to docker/openssl/snapdropCert.cnf