diff --git a/services/ingress/default_http.conf b/services/ingress/default_http.conf new file mode 100644 index 0000000..e8077c5 --- /dev/null +++ b/services/ingress/default_http.conf @@ -0,0 +1,13 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + listen 443 default_server; + listen [::]:443 default_server; + +# ssl_reject_handshake on; + ssl_certificate /etc/ssl/null.crt; + ssl_certificate_key /etc/ssl/null.key; + + server_name ""; + return 444; +} diff --git a/services/ingress/nextcloud.conf b/services/ingress/nextcloud.conf index 921e8c6..8939ad3 100644 --- a/services/ingress/nextcloud.conf +++ b/services/ingress/nextcloud.conf @@ -1,9 +1,9 @@ server { - listen 443 ssl default_server; # managed by Certbot + listen 443 ssl; # managed by Certbot server_name skazochnik.spb.ru gipat; location / { proxy_pass http://gipat:5002/; - sub_filter "http://gipat:5002/" "https://skazochnik.spb.ru/"; + sub_filter "http://gipat:5002/" "https://skazochnik.spb.ru/"; client_max_body_size 0; } diff --git a/services/nextcloud/cron_job.txt b/services/nextcloud/cron_job.txt new file mode 100644 index 0000000..9643852 --- /dev/null +++ b/services/nextcloud/cron_job.txt @@ -0,0 +1 @@ +*/5 * * * * docker exec --user www-data nextcloud-app-1 php -f /var/www/html/cron.php diff --git a/services/nextcloud/docker-compose.yml b/services/nextcloud/docker-compose.yml index 083ee0d..00e91fc 100644 --- a/services/nextcloud/docker-compose.yml +++ b/services/nextcloud/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: app: image: "nextcloud" @@ -15,19 +14,5 @@ services: - POSTGRES_DB=nextcloud - POSTGRES_USER=nextcloud - POSTGRES_PASSWORD=qw6MGQcaMkvG8sR9yVsU + - PHP_UPLOAD_LIMIT=16G - cron: - image: "nextcloud" - entrypoint: /cron.sh - restart: always - user: www-data - volumes: - - /mnt/Teka1/nextcloud:/var/www/html - - /mnt/Teka1/Videos:/mnt/Teka1/Videos - - /mnt/Teka2/Videos:/mnt/Teka2/Videos - - /mnt/Teka3/Videos:/mnt/Teka3/Videos - environment: - - POSTGRES_HOST=192.168.0.101 - - POSTGRES_DB=nextcloud - - POSTGRES_USER=nextcloud - - POSTGRES_PASSWORD=qw6MGQcaMkvG8sR9yVsU \ No newline at end of file diff --git a/services/transmission/data/config/settings.json b/services/transmission/data/config/settings.json index 76bf32a..9262ec9 100644 --- a/services/transmission/data/config/settings.json +++ b/services/transmission/data/config/settings.json @@ -50,7 +50,7 @@ "rpc-enabled": true, "rpc-host-whitelist": "", "rpc-host-whitelist-enabled": false, - "rpc-password": "{9101817e3fda279b216c16da0a41cc6ef8ff8f342lNFx6me", + "rpc-password": "{adbe4fb172c032c2d7a4f5a37e31172fb6b91f6eNx/VbAlf", "rpc-port": 9091, "rpc-socket-mode": "0750", "rpc-url": "/transmission/",