diff --git a/docker-compose.yml b/docker-compose.yml index adad0e71..900ec248 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,6 +46,8 @@ services: volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf - webApp:/usr/share/nginx/html + - certbotConf:/etc/letsencrypt + - certbotChall:/var/www/certbot depends_on: - user-interface @@ -57,26 +59,19 @@ services: - "83:83" volumes: - webApp:/app/build/web - # - ./certbot/www:/var/www/certbot depends_on: - api - # certbot: - # image: certbot/certbot - # container_name: certbot - # volumes: - # - ./certbot/conf:/etc/letsencrypt - # - ./certbot/www:/var/www/certbot - # depends_on: - # - user-interface - # #command: certonly --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za --agree-tos --manual --preferred-challenges dns - # command: certonly --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za --agree-tos - # # command: >- - # # certonly --test-cert --reinstall --webroot --webroot-path=/var/www/certbot - # # --email yasienmeth@gmail.com --agree-tos --no-eff-email - # # -d mzansi-innovation-hub.co.za - # # depends_on: - # # - user-interface + certbot: + image: certbot/certbot + container_name: certbot + volumes: + - certbotConf:/etc/letsencrypt + - certbotChall:/var/www/certbot + #command: certonly --test-cert --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos + command: certonly --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos + depends_on: + - nginx minio: container_name: MIH-Minio diff --git a/nginx/nginx.conf b/nginx/nginx.conf index f6684783..00f2d2b0 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,3 +1,38 @@ +# http { +# server_tokens off; +# charset utf-8; + +# # always redirect to https +# server { +# listen 80 default_server; + +# server_name _; + +# return 301 https://$host$request_uri; +# } + +# server { +# listen 443 ssl http2; +# # use the certificates +# # ssl_certificate /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem; +# # ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem; +# server_name mzansi-innovation-hub.co.za www.mzansi-innovation-hub.co.za; +# root /var/www/html; +# index index.php index.html index.htm; + + +# location / { +# root /usr/share/nginx/html; +# index index.html; +# try_files $uri $uri/ =404; +# } + +# location ~ /.well-known/acme-challenge/ { +# root /var/www/certbot; +# } +# } +# } + events { worker_connections 1024; } @@ -23,23 +58,4 @@ http { # return 301 https://$host$request_uri; } - - # server { - # listen 443 ssl; - # http2 on; - # # use the certificates - # ssl_certificate /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem; - # server_name mzansi-innovation-hub.co.za; - # root /var/www/html; - # index index.php index.html index.htm; - - # location / { - # root /usr/share/nginx/html; - # index index.html; - # try_files $uri $uri/ =404; - # } - - # } } -