diff --git a/.gitignore b/.gitignore index 1c226f9..a4a1eb5 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,7 @@ dist # Service worker sw.* *.private.env.json + +# Certificates +data/ +letsencrypt/ diff --git a/docker-compose.yml b/docker-compose.yml index b1a800b..8b50012 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,8 @@ services: volumes: - ./frontend/dist:/usr/share/nginx/html - ./nginx:/etc/nginx/conf.d - - ./nginx/certbot/conf:/etc/letsencrypt - - ./nginx/certbot/www:/var/www/certbot + - ./data/certbot/conf:/etc/letsencrypt + - ./data/certbot/www:/var/www/certbot ports: - 80:80 - 443:443 @@ -23,8 +23,8 @@ services: certbot: image: certbot/certbot volumes: - - ./nginx/certbot/conf:/etc/letsencrypt - - ./nginx/certbot/www:/var/www/certbot + - ./data/certbot/conf:/etc/letsencrypt + - ./data/certbot/www:/var/www/certbot db: image: mariadb @@ -62,4 +62,4 @@ services: condition: service_healthy volumes: - notes-db-volume: \ No newline at end of file + notes-db-volume: diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index 673fcf9..f0ac2e4 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -5,10 +5,10 @@ if ! [ -x "$(command -v docker-compose)" ]; then exit 1 fi -domains=(simplenotes.be www.simplenotes.be) +domains=(simplenotes.be) rsa_key_size=4096 -data_path="./nginx/certbot" -email="" +data_path="./data/certbot" +email="hubv@protonmail.com" staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits if [ -d "$data_path" ]; then diff --git a/nginx/server.conf b/nginx/server.conf index 1168ca9..3792a75 100644 --- a/nginx/server.conf +++ b/nginx/server.conf @@ -15,8 +15,8 @@ server { listen 443 ssl; server_name simplenotes.be; - ssl_certificate /etc/letsencrypt/live/example.org/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/example.org/privkey.pem; + ssl_certificate /etc/letsencrypt/live/simplenotes.be/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/simplenotes.be/privkey.pem; include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;