diff --git a/README_docker_compose.md b/README_docker_compose.md index 5356694..e69d1d0 100644 --- a/README_docker_compose.md +++ b/README_docker_compose.md @@ -7,4 +7,13 @@ docker context create ruVdsina --docker "host=ssh://root@v1320012.hosted-by-vdsi docker context use ruVdsina docker-compose -c ruVdsina -f /media/DATA/src/ansible/docker-compose-gogs.yaml up -d -docker-compose -c ruVdsina -f /media/DATA/src/ansible/docker-compose-nginx-nossl.yaml up -d --build \ No newline at end of file +docker-compose -c ruVdsina -f /media/DATA/src/ansible/docker-compose-nginx.yaml up -d --build + +docker container run --rm -it \ +-v nextcloud_nextcloud_mysql:/from \ +-v st_nextcloud_nextcloud_mysql:/to \ +alpine ash -c "cd /to; rm -r *;cd /from ; cp -av . /to" + +ip host nextcloud.rudolf.keenetic.link 192.168.1.96 +no ip host nextcloud.rudolf.keenetic.link 192.168.1.96 +system configuration save diff --git a/docker-compose-nginx-nossl.yaml b/docker-compose-nginx-nossl.yaml index 17797bb..ec4739b 100644 --- a/docker-compose-nginx-nossl.yaml +++ b/docker-compose-nginx-nossl.yaml @@ -1,20 +1,25 @@ version: "3.8" + +#https://github.com/nginx-proxy/nginx-proxy +#https://github.com/nginx-proxy/acme-companion: + +networks: + nextcloud_default: + external: true + +volumes: + certs: + acme: + vhost.d: + html: + services: nginx: - build: - - context: nginx - dockerfile: Dockerfile-nginx-nossl -# image: nginx -# environment: -# LETSENCRYPT_EMAIL: "rudolfss13@gmail.com" + image: nginxproxy/nginx-proxy ports: - "80:80" - "443:443" -# volumes: -# - "nginx_letsencrypt:/etc/letsencrypt" -# - "nginx_sites:/etc/nginx/sites-available" - -#volumes: -# nginx_letsencrypt: { } -# nginx_sites: { } \ No newline at end of file + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + networks: + - nextcloud_default diff --git a/docker-compose-nginx-test.yaml b/docker-compose-nginx-test.yaml new file mode 100644 index 0000000..3268170 --- /dev/null +++ b/docker-compose-nginx-test.yaml @@ -0,0 +1,12 @@ +version: "3.8" + +#https://github.com/nginx-proxy/nginx-proxy +#https://github.com/nginx-proxy/acme-companion: + +services: + nginx_test: + image: nginx + environment: + - VIRTUAL_HOST=test.rudolf.keenetic.link + - LETSENCRYPT_HOST=test.rudolf.keenetic.link + - LETSENCRYPT_TEST=true diff --git a/docker-compose-nginx.yaml b/docker-compose-nginx.yaml index d90ff98..76a245d 100644 --- a/docker-compose-nginx.yaml +++ b/docker-compose-nginx.yaml @@ -1,43 +1,50 @@ version: "3.8" + +#https://github.com/nginx-proxy/nginx-proxy +#https://github.com/nginx-proxy/acme-companion: + +networks: + nextcloud_default: + external: true + proxy-tier: + +volumes: + certs: + conf: + acme: + vhost.d: + html: + services: - nginx-proxy: - image: jwilder/nginx-proxy - container_name: nginx-proxy - labels: - - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" - # такой лейбл позволит контейнеру с цертботом понять, какой из запущенных nginx - реверс-прокси. + nginx: + image: nginxproxy/nginx-proxy ports: - "80:80" - "443:443" volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - - ./certs:/etc/nginx/certs:ro - - ./vhost.d:/etc/nginx/vhost.d:ro - - /usr/share/nginx/html + - conf:/etc/nginx/conf.d + - certs:/etc/nginx/certs:ro + - vhost.d:/etc/nginx/vhost.d + - html:/usr/share/nginx/html + networks: + - nextcloud_default + - proxy-tier - letsencrypt-companion: - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-companion + nginx_acme: + image: nginxproxy/acme-companion volumes_from: - - nginx-proxy + - "nginx" volumes: + - conf:/etc/nginx/conf.d + - certs:/etc/nginx/certs + - acme:/etc/acme.sh + - vhost.d:/etc/nginx/vhost.d + - html:/usr/share/nginx/html - /var/run/docker.sock:/var/run/docker.sock:ro - - ./certs:/etc/nginx/certs:rw - - ./vhost.d:/etc/nginx/vhost.d:rw -# nginx: -# build: -# context: . -# dockerfile: Dockerfile-nginx -## image: nginx -# environment: -# LETSENCRYPT_EMAIL: "rudolfss13@gmail.com" -# ports: -# - "81:80" -# - "443:443" -# volumes: -# - "nginx_letsencrypt:/etc/letsencrypt" -# - "nginx_sites:/etc/nginx/sites-available" - -volumes: - nginx_letsencrypt: { } - nginx_sites: { } \ No newline at end of file + environment: + - DEFAULT_EMAIL=rudolfss13@gmail.com + networks: + - proxy-tier + depends_on: + - nginx diff --git a/nextcloud/docker-compose-nextcloud.yaml b/nextcloud/docker-compose-nextcloud.yaml index 0dd2919..c2f061d 100644 --- a/nextcloud/docker-compose-nextcloud.yaml +++ b/nextcloud/docker-compose-nextcloud.yaml @@ -52,16 +52,12 @@ services: - /media/DATA/runtime/nextcloud/data:/var/www/html/data - /media/DATA:/var/DATA environment: - - VIRTUAL_HOST= - - LETSENCRYPT_HOST= - - LETSENCRYPT_EMAIL= + - VIRTUAL_HOST=nextcloud.rudolf.keenetic.link + - LETSENCRYPT_HOST=nextcloud.rudolf.keenetic.link ports: - 8080:80 - - 80:80 depends_on: - app - networks: - - default cron: image: nextcloud:fpm-alpine diff --git a/nextcloud/web/nginx.conf b/nextcloud/web/nginx.conf index c74ea99..a4f155c 100644 --- a/nextcloud/web/nginx.conf +++ b/nextcloud/web/nginx.conf @@ -45,7 +45,9 @@ http { #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; # set max upload size - client_max_body_size 512M; + client_max_body_size 15G; + proxy_request_buffering off; + fastcgi_buffers 64 4K; # Enable gzip but do not remove ETag headers