aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-12-20 20:46:41 +0100
committerGravatar GitHub <noreply@github.com> 2021-12-20 20:46:41 +0100
commit816f4178dc2852f47c0d5d81cd8c665d7e48c731 (patch)
treef8098f1acb3d07b73560d9af4c4c9d73dac0fb7e
parent1ac3effce53e39d89272dfc95b0c68fcaa122dfb (diff)
Docker fix missing .htaccess (#4074)
Related to https://github.com/FreshRSS/FreshRSS/issues/4073 In our Docker configuration, `.htaccess` files are included only once at startup. The one for themes was missing.
-rw-r--r--Docker/FreshRSS.Apache.conf4
-rw-r--r--p/.htaccess3
-rw-r--r--p/themes/.htaccess1
3 files changed, 5 insertions, 3 deletions
diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf
index 050ea4805..c7a0080ac 100644
--- a/Docker/FreshRSS.Apache.conf
+++ b/Docker/FreshRSS.Apache.conf
@@ -29,3 +29,7 @@ ServerTokens OS
<Directory /var/www/FreshRSS/p/i>
IncludeOptional /var/www/FreshRSS/p/i/.htaccess
</Directory>
+
+<Directory /var/www/FreshRSS/p/themes>
+ Include /var/www/FreshRSS/p/themes/.htaccess
+</Directory>
diff --git a/p/.htaccess b/p/.htaccess
index 909fb6cdc..55264a4f4 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -7,10 +7,7 @@ AddDefaultCharset UTF-8
<IfModule mod_mime.c>
AddType application/json .map
- AddType application/font-woff .woff
- AddType application/font-woff2 .woff2
- AddCharset UTF-8 .css
AddCharset UTF-8 .html
AddCharset UTF-8 .js
</IfModule>
diff --git a/p/themes/.htaccess b/p/themes/.htaccess
index 706a7b88e..796c55ae0 100644
--- a/p/themes/.htaccess
+++ b/p/themes/.htaccess
@@ -1,5 +1,6 @@
<IfModule mod_mime.c>
AddType application/font-woff .woff
+ AddType application/font-woff2 .woff2
AddCharset UTF-8 .css
AddCharset UTF-8 .svg