aboutsummaryrefslogtreecommitdiff
path: root/docs/en/users/01_Installation.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en/users/01_Installation.md')
-rw-r--r--docs/en/users/01_Installation.md25
1 files changed, 18 insertions, 7 deletions
diff --git a/docs/en/users/01_Installation.md b/docs/en/users/01_Installation.md
index d0046eebe..9d012f2b1 100644
--- a/docs/en/users/01_Installation.md
+++ b/docs/en/users/01_Installation.md
@@ -1,6 +1,6 @@
# Server requirements
-FreshRSS is a web application. This means you'll need a web server to run it. FreshRSS requirements are really low, so it could run on most shared host servers.
+FreshRSS is a web application. This means you’ll need a web server to run it. FreshRSS requirements are really low, so it could run on most shared host servers.
You need to verify that your server can run FreshRSS before installing it. If your server has the proper requirements and FreshRSS does not work, please contact us to find a solution.
@@ -35,7 +35,7 @@ As its name suggests, it is the working release for developers. **This release i
# Apache installation
-This is an example Apache virtual hosts configuration file. It covers http and https configuration.
+This is an example Apache virtual hosts configuration file. It covers HTTP and HTTPS configuration.
```
<VirtualHost *:80>
@@ -51,6 +51,11 @@ This is an example Apache virtual hosts configuration file. It covers http and h
ServerName rss.example.net
DocumentRoot /path/to/FreshRSS/p/
+ <Directory /path/to/FreshRSS/p>
+ AllowOverride AuthConfig FileInfo Indexes Limit
+ Require all granted
+ </Directory>
+
ErrorLog ${APACHE_LOG_DIR}/freshrss_error.log
CustomLog ${APACHE_LOG_DIR}/freshrss_access.log combined
@@ -62,6 +67,11 @@ This is an example Apache virtual hosts configuration file. It covers http and h
ServerName rss.example.net
DocumentRoot /path/to/FreshRSS/p/
+ <Directory /path/to/FreshRSS/p>
+ AllowOverride AuthConfig FileInfo Indexes Limit
+ Require all granted
+ </Directory>
+
ErrorLog ${APACHE_LOG_DIR}/freshrss_error.log
CustomLog ${APACHE_LOG_DIR}/freshrss_access.log combined
@@ -69,6 +79,7 @@ This is an example Apache virtual hosts configuration file. It covers http and h
Protocols h2 http/1.1
</IfModule>
+ # For the API
AllowEncodedSlashes On
SSLEngine on
@@ -82,7 +93,7 @@ This is an example Apache virtual hosts configuration file. It covers http and h
# Nginx installation
-This is an example nginx configuration file. It covers http, https and php-fpm configuration.
+This is an example nginx configuration file. It covers HTTP, HTTP, and php-fpm configuration.
_You can find simpler config file but they may be incompatible with FreshRSS API._
@@ -91,12 +102,12 @@ server {
listen 80;
listen 443 ssl;
- # https configuration
+ # HTTPS configuration
ssl on;
ssl_certificate /etc/nginx/server.crt;
ssl_certificate_key /etc/nginx/server.key;
- # your server's url(s)
+ # your server’s URL(s)
server_name rss.example.net;
# the folder p of your FreshRSS installation
@@ -114,7 +125,7 @@ server {
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
# By default, the variable PATH_INFO is not set under PHP-FPM
- # But FreshRSS API greader.php need it. If you have a "Bad Request" error, double check this var !
+ # But FreshRSS API greader.php need it. If you have a “Bad Request” error, double check this var!
fastcgi_param PATH_INFO $fastcgi_path_info;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -126,7 +137,7 @@ server {
}
```
-A step-by-step tutorial is available [in french](http://www.pihomeserver.fr/2013/05/08/raspberry-pi-home-server-installer-un-agregateur-de-flux-rss-pour-remplacer-google-reader/).
+A step-by-step tutorial is available [in French](http://www.pihomeserver.fr/2013/05/08/raspberry-pi-home-server-installer-un-agregateur-de-flux-rss-pour-remplacer-google-reader/).
# Security