1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dokuwiki_ynh.git synced 2024-09-03 18:26:20 +02:00

[fix] dedicated named location per $app (#63)

* Url rewriting (#54)

* Remove unused code

* Add rewrite URL functionnality

* Fix subpath handling

* Fix nginx error

nginx: [emerg] named location "@dokuwiki" can be on the server level only in /etc/nginx/conf.d/sub.example.org.d/dokuwiki.conf:20

* [enh] Enforce URL rewrite

* Increment package version

* [fix] dedicated named location per $app (#61)

fix multiple install on subdomains

Before this fix
app1 => @dokuwiki   works
app2 => @dokuwiki   fails

After \o/
app1 => @app1       works
app2 => @app2       works

Co-authored-by: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
This commit is contained in:
Gofannon 2020-04-22 22:37:42 +02:00 committed by GitHub
parent 7a70f8af76
commit 500a7d3fa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,7 +19,7 @@ location __PATH__/ {
# Common parameter to increase upload size limit in conjuction with dedicated php-fpm file # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file
client_max_body_size 25M; client_max_body_size 25M;
try_files $uri $uri/ @dokuwiki; try_files $uri $uri/ @__NAME__ ;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
@ -53,7 +53,7 @@ location __PATH__/ {
} }
# rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki confi$ # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki confi$
location @dokuwiki { location @__NAME__ {
rewrite ^__PATH__/_media/(.*) __PATH__/lib/exe/fetch.php?media=$1 last; rewrite ^__PATH__/_media/(.*) __PATH__/lib/exe/fetch.php?media=$1 last;
rewrite ^__PATH__/_detail/(.*) __PATH__/lib/exe/detail.php?media=$1 last; rewrite ^__PATH__/_detail/(.*) __PATH__/lib/exe/detail.php?media=$1 last;
rewrite ^__PATH__/_export/([^/]+)/(.*) __PATH__/doku.php?do=export_$1&id=$2 last; rewrite ^__PATH__/_export/([^/]+)/(.*) __PATH__/doku.php?do=export_$1&id=$2 last;