YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1647 from YunoHost/enh_well-known

Browse source 
[enh] exclude .well-known subpaths from conflict checks
This commit is contained in:
Tagada 2024-08-15 20:50:17 +02:00 • committed by GitHub
commit f88e4cacdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app.py
View file

@ -2937,7 +2937,7 @@ def _get_conflicting_apps(domain, path, ignore_app=None):
for p, a in apps_map[domain].items(): for p, a in apps_map[domain].items():
if a["id"] == ignore_app: if a["id"] == ignore_app:
continue continue
if path == p or path == "/" or p == "/": if path == p or ( not path.startswith("/.well-known/") and ( path == "/" or p == "/" ) ):
conflicts.append((p, a["id"], a["label"])) conflicts.append((p, a["id"], a["label"]))
return conflicts return conflicts