From 975ff8b1aa827b69f0aa7a93fb85824de7bbc5fc Mon Sep 17 00:00:00 2001 From: bmen Date: Sat, 14 Sep 2019 15:44:47 +0200 Subject: [PATCH] Wechsel von docker-compose version 2 zu 3 und DB und nginx Vorlagen --- db.env | 3 + docker-compose.yml | 60 +++++++++-------- nginx.conf | 156 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 26 deletions(-) create mode 100644 db.env create mode 100644 nginx.conf diff --git a/db.env b/db.env new file mode 100644 index 0000000..70af15c --- /dev/null +++ b/db.env @@ -0,0 +1,3 @@ +MYSQL_PASSWORD=nextcloud +MYSQL_DATABASE=nextcloud +MYSQL_USER=nextcloud diff --git a/docker-compose.yml b/docker-compose.yml index 509bbe1..25797af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' networks: webproxy: @@ -13,54 +13,62 @@ services: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - - /opt/appdata/nextcloud/mysql:/var/lib/mysql - networks: - - backend-nextcloud + - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD=nextcloud - - MYSQL_PASSWORD=nextcloud - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - container_name: nextcloud-db-bmen-cc + env_file: + - db.env + container_name: nextcloud-db redis: image: redis:alpine - container_name: nextcloud-redis-bmen-cc - restart: always + container_name: nextcloud-redis networks: - backend-nextcloud + restart: always app: - image: nextcloud:fpm - links: - - db + image: nextcloud:fpm-alpine + restart: always + volumes: + - nextcloud:/var/www/html environment: - MYSQL_HOST=db - REDIS_HOST=redis + env_file: + - db.env networks: - backend-nextcloud - volumes: - - /opt/appdata/nextcloud/www:/var/www/html - container_name: nextcloud-bmen-cc - restart: always depends_on: - db - redis + container_name: nextcloud web: - image: nginx + build: ./web + restart: always ports: - 8080:80 - links: + volumes: + - nextcloud:/var/www/html:ro + depends_on: - app networks: - webproxy - backend-nextcloud - volumes: - - /opt/appdata/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro - volumes_from: - - app - container_name: nextcloud-nginx-bmen-cc - depends_on: - - app + container_name: nextcloud-nginx + + cron: + image: nextcloud:fpm-alpine restart: always + volumes: + - nextcloud:/var/www/html + entrypoint: /cron.sh + depends_on: + - db + - redis + container_name: nextcloud-cron + +volumes: + db: /opt/appdata/nextcloud/mysql + nextcloud: /opt/appdata/nextcloud diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..b5cffcb --- /dev/null +++ b/nginx.conf @@ -0,0 +1,156 @@ +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + upstream php-handler { + server app:9000; + } + + server { + listen 80; + + # Add headers to serve security related headers + # Before enabling Strict-Transport-Security headers please read into this + # topic first. + # add_header Strict-Transport-Security "max-age=15768000; + # includeSubDomains; preload;"; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + + root /var/www/html; + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # The following 2 rules are only needed for the user_webfinger app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json + # last; + + location = /.well-known/carddav { + return 301 $scheme://$host/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host/remote.php/dav; + } + + # set max upload size + client_max_body_size 10G; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + # Uncomment if your server is build with the ngx_pagespeed module + # This module is currently not supported. + #pagespeed off; + + location / { + rewrite ^ /index.php$request_uri; + } + + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { + deny all; + } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { + deny all; + } + + location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) { + fastcgi_split_path_info ^(.+\.php)(/.*)$; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + # fastcgi_param HTTPS on; + #Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass php-handler; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ ^/(?:updater|ocs-provider)(?:$|/) { + try_files $uri/ =404; + index index.php; + } + + # Adding the cache control header for js and css files + # Make sure it is BELOW the PHP block + location ~ \.(?:css|js|woff2?|svg|gif)$ { + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + # Add headers to serve security related headers (It is intended to + # have those duplicated to the ones above) + # Before enabling Strict-Transport-Security headers please read into + # this topic first. + # add_header Strict-Transport-Security "max-age=15768000; + # includeSubDomains; preload;"; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + + # Optional: Don't log access to assets + access_log off; + } + + location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ { + try_files $uri /index.php$request_uri; + # Optional: Don't log access to other assets + access_log off; + } + } + +}