aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-06-17 08:34:48 +02:00
Code Activity

Merge pull request #10 from nextcloud/master

Browse source 
Merge master back
This commit is contained in:
kgw4it 2019-07-08 14:56:27 +02:00 • committed by GitHub
commit 86c4510b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 1240 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

2
.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

3
.examples/docker-compose/insecure/postgres/apache/db.env
View file

@ -1,3 +1,2 @@
POSTGRES_PASSWORD=
POSTGRES_DB=nextcloud
POSTGRES_USER=nextcloud
POSTGRES_USER=postgres

1
.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
View file

@ -18,6 +18,7 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:

3
.examples/docker-compose/insecure/postgres/fpm/db.env
View file

@ -1,3 +1,2 @@
POSTGRES_PASSWORD=
POSTGRES_DB=nextcloud
POSTGRES_USER=nextcloud
POSTGRES_USER=postgres

1
.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
View file

@ -16,6 +16,7 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:

2
.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

1
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

2
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

1
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

1
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

2
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

1
.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

1
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

2
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

3
.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
View file

@ -1,3 +1,2 @@
POSTGRES_PASSWORD=
POSTGRES_DB=nextcloud
POSTGRES_USER=nextcloud
POSTGRES_USER=postgres

1
.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
View file

@ -19,6 +19,7 @@ services:
- LETSENCRYPT_HOST=
- LETSENCRYPT_EMAIL=
- POSTGRES_HOST=db
- POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:

1
.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

3
.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
View file

@ -1,3 +1,2 @@
POSTGRES_PASSWORD=
POSTGRES_DB=nextcloud
POSTGRES_USER=nextcloud
POSTGRES_USER=postgres

1
.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
View file

@ -16,6 +16,7 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:

1
.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/uploadsize.conf
View file

@ -1 +1,2 @@
client_max_body_size 10G;
proxy_request_buffering off;

2
.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
View file

@ -1,4 +1,4 @@
worker_processes 1;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;