Revize 43cc50af

redirect to https only + fix renew script and sites ...

docker-compose-prod.yml

@@ -7 +7 @@
               ports: 
                      - "443:443"
               volumes: 
+                     - /acme:/root/.acme.sh/heatmap.zcu.cz
                      - /etc/certificate:/certificate
-                     - ./docker/nginx/sites-dev:/etc/nginx/sites-available
+                     - ./docker/nginx/sites:/etc/nginx/sites-available
                      - /acme-challenge:/var/www/symfony/public/.well-known/acme-challenge/
        crawler:
               volumes: 

docker/nginx/sites/default.conf

@@ -4 +4 @@
     listen [::]:80 default_server ipv6only=on;
 
     server_name heatmap.zcu.cz www.heatmap.zcu.cz;
-    ssl_certificate /certificate/key.pem;
-    ssl_certificate_key /certificate/cert.pem;
+    ssl_certificate /certificate/cert.pem;
+    ssl_certificate_key /certificate/key.pem;
 
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
     ssl_prefer_server_ciphers on;
@@ -34 +34 @@
         deny all;
     }
 }
+server {
+    listen 80 ;
+    listen [::]:80;
+    server_name heatmap.zcu.cz www.heatmap.zcu.cz;
+
+    # Redirect all HTTP requests to HTTPS with a 301 Moved Permanently response.
+    return 301 https://$host$request_uri;
+}

scripts/renew_certificate.sh

@@ -6 +6 @@
 if [ "$1" = "new" ]; then
     docker-compose exec nginx /bin/sh -c "
     cd /root/.acme.sh; \
-    bash acme.sh  --issue  -d www.heatmap.zcu.cz  --nginx /etc/nginx/sites-available/default.conf --debug 2; \
+    bash acme.sh  --issue  -d heatmap.zcu.cz  --nginx /etc/nginx/sites-available/default.conf --debug 2; \
     bash acme.sh --installcert -d heatmap.zcu.cz \
     --key-file /certificate/key.pem \
     --fullchain-file /certificate/cert.pem \
     --reloadcmd 'bash /etc/init.d/nginx reload';
     ";
 else
-    docker-compose exec nginx /bin/sh -c "acme.sh --renew -d heatmap.zcu.cz";
+    docker-compose exec nginx /bin/sh -c "cd root/.acme.sh && bash acme.sh --renew -d heatmap.zcu.cz";
 fi