Merge branch 'next' into feat/disable-default-redirect

2024-10-11 20:37:08 +11:00
parent 2f3503d8b8 35834ea41d
commit 97c8194588
17 changed files with 393 additions and 377 deletions
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -217,7 +217,10 @@ class Server extends BaseModel
                                    1 => 'https',
                                ],
                                'service' => 'noop',
-                                'rule' => 'HostRegexp(`{catchall:.*}`)',
+                                'rule' => 'HostRegexp(`.+`)',
+                                'tls' => [
+                                    'certResolver' => 'letsencrypt',
+                                ],
                                'priority' => 1,
                            ],
                        ],
@@ -232,7 +235,7 @@ class Server extends BaseModel
                ];
                if (!empty($redirect_url)) {
                    $dynamic_conf['http']['routers']['catchall']['middlewares'] = [
-                        0 => 'redirect-regexp@file',
+                        0 => 'redirect-regexp',
                    ];
                    $dynamic_conf['http']['services']['noop']['loadBalancer']['servers'][0] = [
                        'url' => '',