Compare commits

...

2 commits

Author SHA1 Message Date
b7a91c4b46 Update Grafana 2021-05-17 15:21:55 +02:00
e3151d0942 Upgrade to Nextcloud 21 2021-05-17 15:10:58 +02:00
3 changed files with 14 additions and 18 deletions

View file

@ -2,7 +2,7 @@ version: "3.3"
services: services:
grafana: grafana:
image: grafana/grafana:7.4.3 image: grafana/grafana:7.5.6
restart: unless-stopped restart: unless-stopped
networks: networks:
- web - web
@ -37,7 +37,7 @@ services:
grafanadb: grafanadb:
image: postgres image: postgres:13
volumes: volumes:
- ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data
networks: networks:

View file

@ -28,7 +28,7 @@ services:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
app: app:
image: nextcloud:20-fpm image: nextcloud:21-fpm
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html - ${VOLUMES_PATH}/nextcloud_html:/var/www/html
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data - ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data

View file

@ -63,22 +63,18 @@ http {
access_log off; access_log off;
} }
# The following 2 rules are only needed for the user_webfinger app. # Make a regex exception for `/.well-known` so that clients can still
# Uncomment it if you're planning to use this app. # access it despite the existence of the regex rule
#rewrite ^/.well-known/host-meta /public.php?service=host-meta last; # `location ~ /(\.|autotest|...)` which would otherwise handle requests
#rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; # for `/.well-known`.
location ^~ /.well-known {
location = /.well-known/carddav { return 301 https://$host:443/remote.php/dav; }
location = /.well-known/caldav { return 301 https://$host:443/remote.php/dav; }
# Anything else is dynamically handled by Nextcloud
location ^~ /.well-known { return 301 https://$host:443/index.php$uri; }
# The following rule is only needed for the Social app. try_files $uri $uri/ =404;
# Uncomment it if you're planning to use this app. }
rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
location = /.well-known/carddav {
return 301 https://$host:443/remote.php/dav;
}
location = /.well-known/caldav {
return 301 https://$host:443/remote.php/dav;
}
# set max upload size # set max upload size
client_max_body_size 10G; client_max_body_size 10G;