aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/Server-configuration.html
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-12 03:38:12 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-12 03:38:12 +0100
commit3cc8c898307ad53507a128db2b11238be2641c32 (patch)
tree8b6749678ebc21f4d089db796012541b6f44de03 /doc/Server-configuration.html
parent75f7adee19f3cced8a2d5eb134e9d6723a69a474 (diff)
downloadShaarli-3cc8c898307ad53507a128db2b11238be2641c32.tar.gz
Shaarli-3cc8c898307ad53507a128db2b11238be2641c32.tar.zst
Shaarli-3cc8c898307ad53507a128db2b11238be2641c32.zip
Bump version to v0.8.1
Signed-off-by: ArthurHoaro <arthur@hoa.ro>
Diffstat (limited to 'doc/Server-configuration.html')
-rw-r--r--doc/Server-configuration.html33
1 files changed, 32 insertions, 1 deletions
diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html
index 068900b8..2f1c25b5 100644
--- a/doc/Server-configuration.html
+++ b/doc/Server-configuration.html
@@ -193,6 +193,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
193 ErrorLog<span class="st"> /var/log/apache2/shaarli-error.log</span> 193 ErrorLog<span class="st"> /var/log/apache2/shaarli-error.log</span>
194 CustomLog<span class="st"> /var/log/apache2/shaarli-access.log combined</span> 194 CustomLog<span class="st"> /var/log/apache2/shaarli-access.log combined</span>
195<span class="fu">&lt;/VirtualHost&gt;</span></code></pre></div> 195<span class="fu">&lt;/VirtualHost&gt;</span></code></pre></div>
196<h3 id="htaccess">.htaccess</h3>
197<p>Shaarli use <code>.htaccess</code> Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive <code>AllowOverride All</code> in your virtual host configuration for them to work.</p>
198<p><strong>Warning</strong>: If you use Apache 2.2 or lower, you need <a href="https://httpd.apache.org/docs/current/mod/mod_version.html">mod_version</a> to be installed and enabled.<a href=".html"></a></p>
196<h2 id="lighthttpd">LightHttpd</h2> 199<h2 id="lighthttpd">LightHttpd</h2>
197<h2 id="nginx">Nginx</h2> 200<h2 id="nginx">Nginx</h2>
198<h3 id="foreword">Foreword</h3> 201<h3 id="foreword">Foreword</h3>
@@ -233,7 +236,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
233<li>files may be located in a user's home directory</li> 236<li>files may be located in a user's home directory</li>
234<li>in this case, make sure both Nginx and PHP-FPM are running as the local user/group!</li> 237<li>in this case, make sure both Nginx and PHP-FPM are running as the local user/group!</li>
235</ul> 238</ul>
236<p>For all following examples, a development configuration will be used:</p> 239<p>For all following configuration examples, this user/group pair will be used:</p>
237<ul> 240<ul>
238<li><code>user:group = john:users</code>,</li> 241<li><code>user:group = john:users</code>,</li>
239</ul> 242</ul>
@@ -251,6 +254,24 @@ user john users;
251http { 254http {
252 [...][](.html) 255 [...][](.html)
253}</code></pre> 256}</code></pre>
257<h3 id="optional-increase-the-maximum-file-upload-size">(Optional) Increase the maximum file upload size</h3>
258<p>Some bookmark dumps generated by web browsers can be <em>huge</em> due to the presence of Base64-encoded images and favicons, as well as extra verbosity when nesting links in (sub-)folders.</p>
259<p>To increase upload size, you will need to modify both nginx and PHP configuration:</p>
260<pre class="nginx"><code># /etc/nginx/nginx.conf
261
262http {
263 [...][](.html)
264
265 client_max_body_size 10m;
266
267 [...][](.html)
268}</code></pre>
269<div class="sourceCode"><pre class="sourceCode ini"><code class="sourceCode ini"><span class="co"># /etc/php5/fpm/php.ini</span>
270
271<span class="kw">[...][]</span><span class="dt">(.html)</span>
272<span class="dt">post_max_size </span><span class="ot">=</span><span class="st"> 10M</span>
273<span class="kw">[...][]</span><span class="dt">(.html)</span>
274<span class="dt">upload_max_filesize </span><span class="ot">=</span><span class="st"> 10M</span></code></pre></div>
254<h3 id="minimal-1">Minimal</h3> 275<h3 id="minimal-1">Minimal</h3>
255<p><em>WARNING: Use for development only!</em></p> 276<p><em>WARNING: Use for development only!</em></p>
256<pre class="nginx"><code>user john users; 277<pre class="nginx"><code>user john users;
@@ -350,6 +371,11 @@ http {
350 error_log /var/log/nginx/shaarli.error.log; 371 error_log /var/log/nginx/shaarli.error.log;
351 } 372 }
352 373
374 location = /shaarli/favicon.ico {
375 # serve the Shaarli favicon from its custom location
376 alias /var/www/shaarli/images/favicon.ico;
377 }
378
353 include deny.conf; 379 include deny.conf;
354 include static_assets.conf; 380 include static_assets.conf;
355 include php.conf; 381 include php.conf;
@@ -403,6 +429,11 @@ http {
403 error_log /var/log/nginx/shaarli.error.log; 429 error_log /var/log/nginx/shaarli.error.log;
404 } 430 }
405 431
432 location = /shaarli/favicon.ico {
433 # serve the Shaarli favicon from its custom location
434 alias /var/www/shaarli/images/favicon.ico;
435 }
436
406 include deny.conf; 437 include deny.conf;
407 include static_assets.conf; 438 include static_assets.conf;
408 include php.conf; 439 include php.conf;