diff options
| author | friendica <info@friendica.com> | 2014-09-09 15:53:25 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-09 15:53:25 -0700 |
| commit | 35051405a0cd7d3635641dffa44bdde2d1efee36 (patch) | |
| tree | 825a119313cd789934ce66bb1e9a3aaec8fc0e5e /doc/install/sample-nginx.conf | |
| parent | 420fd595135037c9c02260f19fa8d125ec4662c5 (diff) | |
| parent | 9aadf82972dbbba90ccf0abe9bf6ff41c1dca8e1 (diff) | |
| download | volse-hubzilla-35051405a0cd7d3635641dffa44bdde2d1efee36.tar.gz volse-hubzilla-35051405a0cd7d3635641dffa44bdde2d1efee36.tar.bz2 volse-hubzilla-35051405a0cd7d3635641dffa44bdde2d1efee36.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'doc/install/sample-nginx.conf')
| -rw-r--r-- | doc/install/sample-nginx.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index ade323a4f..f53a3d5fb 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -65,7 +65,9 @@ server { charset utf-8; root /var/www/red; access_log /var/log/nginx/red.log; - #Uncomment the following line to include a standard configuration file + #Uncomment the following line to include a standard configuration file + #Note that the most specific rule wins and your standard configuration + #will therefore *add* to this file, but not override it. #include standard.conf # allow uploads up to 20MB in size client_max_body_size 20m; |