diff --git a/docker-compose.yml b/docker-compose.yml index bd3eb36b3b61b87e9a6d805a279bf7b8f2dfeef5..93c7959cfab46e64bae827fd1488a47ff066c3a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,13 +5,6 @@ services: container_name: "kuadrado" ports: - "80:80" - - "443:443" + # - "443:443" volumes: - ./public:/usr/share/nginx/html - - ./data/certbot/conf:/etc/letsencrypt - - ./data/certbot/www:/var/www/certbot - certbot: - image: certbot/certbot - volumes: - - ./data/certbot/conf:/etc/letsencrypt - - ./data/certbot/www:/var/www/certbot diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh deleted file mode 100755 index ef7cc0854493a63b8ebc6ff365a6e4569c6b0778..0000000000000000000000000000000000000000 --- a/init-letsencrypt.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -if ! [ -x "$(command -v docker-compose)" ]; then - echo 'Error: docker-compose is not installed.' >&2 - exit 1 -fi - -domains=(kuadrado-software.fr www.kuadrado-software.fr) -rsa_key_size=4096 -data_path="./data/certbot" -email="contact@kuadrado-software.fr" -staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits - -if [ -d "$data_path" ]; then - read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision - if [ "$decision" != "Y" ] && [ "$decision" != "y" ]; then - exit - fi -fi - - -if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then - echo "### Downloading recommended TLS parameters ..." - mkdir -p "$data_path/conf" - curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" - curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" - echo -fi - -echo "### Creating dummy certificate for $domains ..." -path="/etc/letsencrypt/live/$domains" -mkdir -p "$data_path/conf/live/$domains" -docker-compose run --rm --entrypoint "\ - openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\ - -keyout '$path/privkey.pem' \ - -out '$path/fullchain.pem' \ - -subj '/CN=localhost'" certbot -echo - - -echo "### Starting nginx ..." -docker-compose up --force-recreate -d nginx -echo - -echo "### Deleting dummy certificate for $domains ..." -docker-compose run --rm --entrypoint "\ - rm -Rf /etc/letsencrypt/live/$domains && \ - rm -Rf /etc/letsencrypt/archive/$domains && \ - rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot -echo - - -echo "### Requesting Let's Encrypt certificate for $domains ..." -#Join $domains to -d args -domain_args="" -for domain in "${domains[@]}"; do - domain_args="$domain_args -d $domain" -done - -# Select appropriate email arg -case "$email" in - "") email_arg="--register-unsafely-without-email" ;; - *) email_arg="--email $email" ;; -esac - -# Enable staging mode if needed -if [ $staging != "0" ]; then staging_arg="--staging"; fi - -docker-compose run --rm --entrypoint "\ - certbot certonly --webroot -w /var/www/certbot \ - $staging_arg \ - $email_arg \ - $domain_args \ - --rsa-key-size $rsa_key_size \ - --agree-tos \ - --force-renewal" certbot -echo - -echo "### Reloading nginx ..." -docker-compose exec nginx nginx -s reload diff --git a/nginx.conf b/nginx.conf index 43b59ff3795f4e93b22f4e8091e0c0088d23d6c2..679901064bad4df705bf05c00d760d88875431f4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -36,22 +36,15 @@ http { # location / { # return 301 https://$host$request_uri; # } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - } - - server { - listen 443 ssl; - server_name kuadrado-software.fr www.kuadrado-software.fr; - index index.html index.htm; - ssl_certificate /etc/letsencrypt/live/kuadrado-software.fr/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ekuadrado-software.fr/privkey.pem; - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - # location / { - # proxy_pass http://kuadrado-software.fr; #for demo purposes + # location /.well-known/acme-challenge/ { + # root /var/www/certbot; # } } + + # server { + # listen 443 ssl; + # server_name kuadrado-software.fr www.kuadrado-software.fr; + # index index.html index.htm; + # } }