aboutsummaryrefslogtreecommitdiff
path: root/Docker/FreshRSS.Apache.conf
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-01-26 16:03:29 +0100
committerGravatar GitHub <noreply@github.com> 2019-01-26 16:03:29 +0100
commit8dcdde6251ae4dfc690b1a014488df125c5e5cdc (patch)
treef5762ac9c76acf708a50534f081e558489ccad86 /Docker/FreshRSS.Apache.conf
parentf0a359619fa2936d66a2b96dd086d4686e7405fa (diff)
parent38e8e265e0f2ead830aa12e7ef81de12599405b5 (diff)
Merge pull request #2220 from FreshRSS/dev1.13.1
FreshRSS 1.13.1
Diffstat (limited to 'Docker/FreshRSS.Apache.conf')
-rw-r--r--Docker/FreshRSS.Apache.conf34
1 files changed, 17 insertions, 17 deletions
diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf
index adfc804c6..80f6389d8 100644
--- a/Docker/FreshRSS.Apache.conf
+++ b/Docker/FreshRSS.Apache.conf
@@ -1,19 +1,3 @@
-<IfModule !deflate_module>
- LoadModule deflate_module modules/mod_deflate.so
-</IfModule>
-<IfModule !expires_module>
- LoadModule expires_module modules/mod_expires.so
-</IfModule>
-<IfModule !headers_module>
- LoadModule headers_module modules/mod_headers.so
-</IfModule>
-<IfModule !mime_module>
- LoadModule mime_module modules/mod_mime.so
-</IfModule>
-<IfModule !rewrite_module>
- LoadModule rewrite_module modules/mod_rewrite.so
-</IfModule>
-
ServerName freshrss.localhost
Listen 0.0.0.0:80
DocumentRoot /var/www/FreshRSS/p/
@@ -21,7 +5,23 @@ CustomLog /dev/stdout combined
ErrorLog /dev/stderr
AllowEncodedSlashes On
+<Directory />
+ AllowOverride None
+ Options FollowSymLinks
+ Require all denied
+</Directory>
+
<Directory /var/www/FreshRSS/p>
- AllowOverride AuthConfig FileInfo Indexes Limit
+ AllowOverride None
+ Include /var/www/FreshRSS/p/.htaccess
+ Options FollowSymLinks
Require all granted
</Directory>
+
+<Directory /var/www/FreshRSS/p/api>
+ Include /var/www/FreshRSS/p/api/.htaccess
+</Directory>
+
+<Directory /var/www/FreshRSS/p/i>
+ IncludeOptional /var/www/FreshRSS/p/i/.htaccess
+</Directory>