Skip to content

Commit 5c240eb

Browse files
authored
Merge pull request #11180 from nextcloud/backport/11179/stable27
[stable27] fix(nginx): adjust config to changed ocm-provider
2 parents 344749e + 800ab97 commit 5c240eb

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

admin_manual/installation/nginx-root.conf.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ server {
9696
# that file is correctly served; if it doesn't, then the request is passed to
9797
# the front-end controller. This consistent behaviour means that we don't need
9898
# to specify custom rules for certain paths (e.g. images and other assets,
99-
# `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
99+
# `/updater`, `/ocs-provider`), and thus
100100
# `try_files $uri $uri/ /index.php$request_uri`
101101
# always provides the desired behaviour.
102102
index index.php index.html /index.php$request_uri;
@@ -143,7 +143,7 @@ server {
143143
# to the URI, resulting in a HTTP 500 error response.
144144
location ~ \.php(?:$|/) {
145145
# Required for legacy support
146-
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
146+
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
147147

148148
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
149149
set $path_info $fastcgi_path_info;

admin_manual/installation/nginx-subdir.conf.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ server {
119119
# that file is correctly served; if it doesn't, then the request is passed to
120120
# the front-end controller. This consistent behaviour means that we don't need
121121
# to specify custom rules for certain paths (e.g. images and other assets,
122-
# `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
122+
# `/updater`, `/ocs-provider`), and thus
123123
# `try_files $uri $uri/ /nextcloud/index.php$request_uri`
124124
# always provides the desired behaviour.
125125
index index.php index.html /nextcloud/index.php$request_uri;
@@ -141,7 +141,7 @@ server {
141141
# `/nextcloud/index.php` to the URI, resulting in a HTTP 500 error response.
142142
location ~ \.php(?:$|/) {
143143
# Required for legacy support
144-
rewrite ^/nextcloud/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /nextcloud/index.php$request_uri;
144+
rewrite ^/nextcloud/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /nextcloud/index.php$request_uri;
145145

146146
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
147147
set $path_info $fastcgi_path_info;

0 commit comments

Comments
 (0)