aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-21 11:06:09 +02:00
Code Activity

update nginx.conf examples to match current NC20 official documentation on the /.well-known section

Browse source 
Signed-off-by: Guillaume Virlet <github@virlet.org>
This commit is contained in:
Guillaume Virlet 2021-05-16 10:21:18 +02:00
parent def2eeae13
commit 1e68d21dd3
4 changed files with 64 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,21 +63,22 @@ 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 {
# The following rule is only needed for the Social app. # The following 6 rules are borrowed from `.htaccess`
# Uncomment it if you're planning to use this app.
#rewrite ^/.well-known/webfinger /public.php?service=webfinger last; rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last;
rewrite ^/\.well-known/host-meta /public.php?service=host-meta last;
location = /.well-known/carddav { rewrite ^/\.well-known/webfinger /public.php?service=webfinger last;
return 301 $scheme://$host:$server_port/remote.php/dav; rewrite ^/\.well-known/nodeinfo /public.php?service=nodeinfo last;
}
location = /.well-known/carddav { return 301 /remote.php/dav/; }
location = /.well-known/caldav { location = /.well-known/caldav { return 301 /remote.php/dav/; }
return 301 $scheme://$host:$server_port/remote.php/dav;
try_files $uri $uri/ =404;
} }
# set max upload size # set max upload size

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

@ -63,21 +63,22 @@ 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 {
# The following rule is only needed for the Social app. # The following 6 rules are borrowed from `.htaccess`
# Uncomment it if you're planning to use this app.
#rewrite ^/.well-known/webfinger /public.php?service=webfinger last; rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last;
rewrite ^/\.well-known/host-meta /public.php?service=host-meta last;
location = /.well-known/carddav { rewrite ^/\.well-known/webfinger /public.php?service=webfinger last;
return 301 $scheme://$host:$server_port/remote.php/dav; rewrite ^/\.well-known/nodeinfo /public.php?service=nodeinfo last;
}
location = /.well-known/carddav { return 301 /remote.php/dav/; }
location = /.well-known/caldav { location = /.well-known/caldav { return 301 /remote.php/dav/; }
return 301 $scheme://$host:$server_port/remote.php/dav;
try_files $uri $uri/ =404;
} }
# set max upload size # set max upload size

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

@ -68,21 +68,22 @@ 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 {
# The following rule is only needed for the Social app. # The following 6 rules are borrowed from `.htaccess`
# Uncomment it if you're planning to use this app.
#rewrite ^/.well-known/webfinger /public.php?service=webfinger last; rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last;
rewrite ^/\.well-known/host-meta /public.php?service=host-meta last;
location = /.well-known/carddav { rewrite ^/\.well-known/webfinger /public.php?service=webfinger last;
return 301 $scheme://$host/remote.php/dav; rewrite ^/\.well-known/nodeinfo /public.php?service=nodeinfo last;
}
location = /.well-known/carddav { return 301 /remote.php/dav/; }
location = /.well-known/caldav { location = /.well-known/caldav { return 301 /remote.php/dav/; }
return 301 $scheme://$host/remote.php/dav;
try_files $uri $uri/ =404;
} }
# set max upload size # set max upload size

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

@ -68,21 +68,22 @@ 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 {
# The following rule is only needed for the Social app. # The following 6 rules are borrowed from `.htaccess`
# Uncomment it if you're planning to use this app.
#rewrite ^/.well-known/webfinger /public.php?service=webfinger last; rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last;
rewrite ^/\.well-known/host-meta /public.php?service=host-meta last;
location = /.well-known/carddav { rewrite ^/\.well-known/webfinger /public.php?service=webfinger last;
return 301 $scheme://$host/remote.php/dav; rewrite ^/\.well-known/nodeinfo /public.php?service=nodeinfo last;
}
location = /.well-known/carddav { return 301 /remote.php/dav/; }
location = /.well-known/caldav { location = /.well-known/caldav { return 301 /remote.php/dav/; }
return 301 $scheme://$host/remote.php/dav;
try_files $uri $uri/ =404;
} }
# set max upload size # set max upload size