fix: move redirects before normal includes for higher priority

neoskop · Dec 2, 2021 · 46a09b6 · 46a09b6
1 parent 408fb18
commit 46a09b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/update/nginx/listeners/cache-config.listener.ts b/src/update/nginx/listeners/cache-config.listener.ts
@@ -11,7 +11,7 @@ export class CacheConfigListener extends ConfigListener {
 
   protected getConfigLines(meta: Meta): string[] {
     const configLines = [
-      `location ~* \\.(?:manifest|appcache|html|xml|json)$ {
+      `location ~* \\.(?:manifest|appcache|xml|json)$ {
           expires -1;
         }`,
       `location ~* (serviceWorker\\.js)$ {

diff --git a/src/update/nginx/listeners/multisite-config-listener.ts b/src/update/nginx/listeners/multisite-config-listener.ts
@@ -89,13 +89,13 @@ export class MultisiteConfigListener {
       error_page 404 /404/index.html;
       root ${rootPath}${prefix};
 
-      include ${this.config.nginxConfigDir}/*.conf;
       include ${this.config.nginxRedirectsDir}/${site.name}.conf;
+      include ${this.config.nginxConfigDir}/*.conf;
 
       location / {
           try_files $uri $uri.html $uri/index.html $uri/index.htm =404;
       }
-      
+
       location = /50x.html {
           root   /usr/share/nginx/html;
       }