summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Procfile2
-rw-r--r--config/nginx/nginx.conf (renamed from config/nginx.conf)0
-rw-r--r--config/nginx/server.crt (renamed from config/server.crt)0
-rw-r--r--config/nginx/server.csr (renamed from config/server.csr)0
-rw-r--r--config/nginx/server.key (renamed from config/server.key)0
-rw-r--r--config/nginx/server.pem (renamed from config/server.pem)0
-rw-r--r--docker-compose.yml6
7 files changed, 4 insertions, 4 deletions
diff --git a/Procfile b/Procfile
index 69f5f53a..8963e86b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
worker: bundle exec rake jobs:work
-web: bundle exec puma -b 'ssl://0.0.0.0:3000?key=config/server.key&cert=config/server.crt' config.ru
+web: bundle exec puma -b 'ssl://0.0.0.0:3000?key=config/nginx/server.key&cert=config/nginx/server.crt' config.ru
diff --git a/config/nginx.conf b/config/nginx/nginx.conf
index 330e9ecb..330e9ecb 100644
--- a/config/nginx.conf
+++ b/config/nginx/nginx.conf
diff --git a/config/server.crt b/config/nginx/server.crt
index 3bbdbc5a..3bbdbc5a 100644
--- a/config/server.crt
+++ b/config/nginx/server.crt
diff --git a/config/server.csr b/config/nginx/server.csr
index d4a9000a..d4a9000a 100644
--- a/config/server.csr
+++ b/config/nginx/server.csr
diff --git a/config/server.key b/config/nginx/server.key
index 0a144338..0a144338 100644
--- a/config/server.key
+++ b/config/nginx/server.key
diff --git a/config/server.pem b/config/nginx/server.pem
index 69cc32fa..69cc32fa 100644
--- a/config/server.pem
+++ b/config/nginx/server.pem
diff --git a/docker-compose.yml b/docker-compose.yml
index 975b446f..db3186c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,10 @@ services:
www:
image: nginx:latest
volumes:
- - ./config/nginx.conf:/etc/nginx/nginx.conf
+ - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
- ./public:/var/www/public
- - ./config/server.crt:/etc/nginx/server.crt
- - ./config/server.key:/etc/nginx/server.key
+ - ./config/nginx/server.crt:/etc/nginx/server.crt
+ - ./config/nginx/server.key:/etc/nginx/server.key
links:
- web
ports: