Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion production/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- doubtfire_logs:/doubtfire/log
- ./shared-files:/shared-files
- ./shared-files/aliases:/etc/aliases:ro
command: /bin/bash -c "bundle exec rails s -b 0.0.0.0"
command: /bin/bash -c "rm -f /doubtfire/tmp/pids/server.pid; bundle exec rails s -b 0.0.0.0"
restart: on-failure:5

# Database server - could be external to docker
Expand Down
10 changes: 5 additions & 5 deletions production/shared-files/proxy-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ http {
# and drop www if present
server {
listen 80;
server_name www.localhost localhost; #update to remove localhost name
return 301 https://localhost$request_uri; #replace localhost with domain name of server
server_name www.34.129.127.168 34.129.127.168#update to remove localhost name
return 301 https://34.129.127.168$request_uri; #replace localhost with domain name of server
}

# Drop www if present in https connections
server { # This new server will watch for traffic on 443
listen 443 ssl;
server_name www.localhost; #replace localhost with domain name of server
server_name www.34.129.127.168; #replace localhost with domain name of server
ssl_certificate /etc/nginx/cert.crt;
ssl_certificate_key /etc/nginx/key.key;
underscores_in_headers on;
return 301 https://localhost$request_uri; #replace localhost with domain name of server
return 301 https://34.129.127.168$request_uri; #replace localhost with domain name of server
}

# We have a direct ssl connection to the domain name...
# Route requests to internal servers
server {
listen 443 ssl;
server_name localhost; #replace localhost with domain name of server
server_name 34.129.127.168; #replace localhost with domain name of server
ssl_certificate /etc/nginx/cert.crt;
ssl_certificate_key /etc/nginx/key.key;

Expand Down