From d3f07a088219d51dd0e122880478872152f1d243 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Wed, 27 Oct 2021 10:54:18 +0200
Subject: [PATCH] Simplify the handling of /static

---
 core/admin/mailu/__init__.py              | 3 +--
 core/admin/mailu/sso/__init__.py          | 2 +-
 core/admin/mailu/static_files/__init__.py | 5 -----
 core/nginx/conf/nginx.conf                | 8 +-------
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 core/admin/mailu/static_files/__init__.py

diff --git a/core/admin/mailu/__init__.py b/core/admin/mailu/__init__.py
index 295d2cfd..4413d68c 100644
--- a/core/admin/mailu/__init__.py
+++ b/core/admin/mailu/__init__.py
@@ -11,7 +11,7 @@ import hmac
 def create_app_from_config(config):
     """ Create a new application based on the given configuration
     """
-    app = flask.Flask(__name__)
+    app = flask.Flask(__name__, static_folder='static_files', static_url_path='')
     app.cli.add_command(manage.mailu)
 
     # Bootstrap is used for error display and flash messages
@@ -62,7 +62,6 @@ def create_app_from_config(config):
     app.register_blueprint(ui.ui, url_prefix='/ui')
     app.register_blueprint(internal.internal, url_prefix='/internal')
     app.register_blueprint(sso.sso, url_prefix='/sso')
-    app.register_blueprint(static_files.static, url_prefix='/static')
     return app
 
 
diff --git a/core/admin/mailu/sso/__init__.py b/core/admin/mailu/sso/__init__.py
index fcdc9cd0..3f3cc39f 100644
--- a/core/admin/mailu/sso/__init__.py
+++ b/core/admin/mailu/sso/__init__.py
@@ -1,5 +1,5 @@
 from flask import Blueprint
 
-sso = Blueprint('sso', __name__, static_folder='static', template_folder='templates')
+sso = Blueprint('sso', __name__, template_folder='templates')
 
 from mailu.sso.views import *
diff --git a/core/admin/mailu/static_files/__init__.py b/core/admin/mailu/static_files/__init__.py
deleted file mode 100644
index f038c076..00000000
--- a/core/admin/mailu/static_files/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-static = Blueprint('static', __name__, static_folder='static', static_url_path='/static')
-
-
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 13317d76..13f5b534 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -129,16 +129,10 @@ http {
 
       # Actual logic
       {% if ADMIN == 'true' or WEBMAIL != 'none' %}
-      location ^~ /sso {
+      location ~ ^/(sso|static) {
         include /etc/nginx/proxy.conf;
         proxy_pass http://$admin;
       }
-
-      location ^~ /static {
-        include /etc/nginx/proxy.conf;
-        rewrite ^/static/(.*) /static/static/$1 break;
-        proxy_pass http://$admin;
-      }
       {% endif %}
 
       {% if WEB_WEBMAIL != '/' and WEBROOT_REDIRECT != 'none' %}