diff --git a/docker-compose.yml b/docker-compose.yml index b25efd5a..23b5aa16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,17 +12,17 @@ services: - 443:443 volumes: - ./backend:/work - - /etc/letsencrypt/live/kikikan.xyz:/etc/letsencrypt/live/kikikan.xyz - - /etc/letsencrypt/archive/kikikan.xyz:/etc/letsencrypt/archive/kikikan.xyz + # - /etc/letsencrypt/live/kikikan.xyz:/etc/letsencrypt/live/kikikan.xyz + # - /etc/letsencrypt/archive/kikikan.xyz:/etc/letsencrypt/archive/kikikan.xyz - ./infra/nginx/default.conf:/etc/nginx/conf.d/default.conf working_dir: /work - certbot: - image: certbot/certbot:v1.7.0 - volumes: - - ./backend:/work - - /etc/letsencrypt:/etc/letsencrypt - command: ["--version"] + # certbot: + # image: certbot/certbot:v1.7.0 + # volumes: + # - ./backend:/work + # - /etc/letsencrypt:/etc/letsencrypt + # command: ["--version"] db: build: ./infra/mysql diff --git a/infra/nginx/default.conf b/infra/nginx/default.conf index e0a111d9..14f5faa1 100644 --- a/infra/nginx/default.conf +++ b/infra/nginx/default.conf @@ -1,11 +1,15 @@ server { listen 80; - listen 443 ssl; server_name kikikan.xyz; - root /work/public; # Redirect to HTTPS return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name kikikan.xyz; + root /work/public; # SSL化 ssl_certificate /etc/letsencrypt/live/kikikan.xyz/fullchain.pem;