mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Merge branch 'dev' into 4.1
This commit is contained in:
commit
66dc1dc578
3 changed files with 18 additions and 1 deletions
7
data/templates/nginx/plain/yunohost_sso.conf.inc
Normal file
7
data/templates/nginx/plain/yunohost_sso.conf.inc
Normal file
|
@ -0,0 +1,7 @@
|
|||
# Avoid the nginx path/alias traversal weakness ( #1037 )
|
||||
rewrite ^/yunohost/sso$ /yunohost/sso/ permanent;
|
||||
|
||||
location /yunohost/sso/ {
|
||||
# This is an empty location, only meant to avoid other locations
|
||||
# from matching /yunohost/sso, such that it's correctly handled by ssowat
|
||||
}
|
|
@ -14,7 +14,7 @@ server {
|
|||
|
||||
include /etc/nginx/conf.d/{{ domain }}.d/*.conf;
|
||||
|
||||
location /yunohost/admin {
|
||||
location /yunohost {
|
||||
return 301 https://$http_host$request_uri;
|
||||
}
|
||||
|
||||
|
@ -60,6 +60,7 @@ server {
|
|||
|
||||
include /etc/nginx/conf.d/{{ domain }}.d/*.conf;
|
||||
|
||||
include /etc/nginx/conf.d/yunohost_sso.conf.inc;
|
||||
include /etc/nginx/conf.d/yunohost_admin.conf.inc;
|
||||
include /etc/nginx/conf.d/yunohost_api.conf.inc;
|
||||
|
||||
|
|
9
debian/changelog
vendored
9
debian/changelog
vendored
|
@ -2,6 +2,15 @@ yunohost (4.1.0) testing; urgency=low
|
|||
|
||||
- Tmp bump of the version number to fix CI (c.f. Breaks: yunohost(<<4.1) in moulinette)
|
||||
|
||||
yunohost (4.0.7) stable; urgency=low
|
||||
|
||||
- [fix] Require explicitly php7.3-foo packages because in some cases Sury's php7.4- packages are installed and php7.3-fpm doesn't get installed ... (1288159a)
|
||||
- [fix] Make sure app nginx confs do not prevent the loading of /yunohost/sso (#1044)
|
||||
|
||||
Thanks to all contributors <3 ! (Kayou, ljf)
|
||||
|
||||
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 04 Sep 2020 14:32:07 +0200
|
||||
|
||||
yunohost (4.0.6.1) stable; urgency=low
|
||||
|
||||
- [fix] Stupid syntax issue in dovecot conf
|
||||
|
|
Loading…
Add table
Reference in a new issue