Revize 33786d3b

fix #2

docker-compose-prod.yml

@@ -11 +11 @@
                      - /etc/certificate:/certificate
                      - ./docker/nginx/sites:/etc/nginx/sites-available
                      - /acme-challenge:/var/www/symfony/public/.well-known/acme-challenge/
+                     - /logs/nginx:/var/log/nginx
        crawler:
               volumes: 
                      - /logs/crawler:/src/CrawlerLogs

docker-compose.yml

@@ -40 +40 @@
                ports:
                        - "80:80"
                volumes:
-                       - ./logs/nginx:/var/nginx/log
+                       - ./logs/nginx:/var/log/nginx
                        - ./website/:/var/www/symfony
                        - ./docker/nginx/sites:/etc/nginx/sites-available
 

docker/nginx/nginx.conf

@@ -1 @@
-user  nginx;
-worker_processes  4;
+user nginx;
+worker_processes 4;
 daemon off;
 
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
+error_log /var/log/nginx/error.log warn;
+pid /var/run/nginx.pid;
 
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }
 
 
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log  /var/log/nginx/access.log;
-    sendfile        on;
-    keepalive_timeout  65;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log /var/log/nginx/access.log;
+    sendfile on;
+    keepalive_timeout 65;
 
     include /etc/nginx/conf.d/*.conf;
     include /etc/nginx/sites-available/*.conf;

docker/nginx/sites/default.conf

@@ +1 @@
+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://$server_name$request_uri;
+}
 server {
     listen 443 ssl;
     listen 80 default_server;
@@ -34 +42 @@
         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://$server_name$request_uri;
-}