diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 18:44:05 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 18:44:05 +0200 |
commit | b230bf207df576fa2ad165702184edf21f674ce7 (patch) | |
tree | 90af6fbddda19c22c1bd21e2fc6ed135116cce48 /doc/Server-configuration.html | |
parent | f501caed215bd12caced5106f9226638b2b15fb4 (diff) | |
download | Shaarli-b230bf207df576fa2ad165702184edf21f674ce7.tar.gz Shaarli-b230bf207df576fa2ad165702184edf21f674ce7.tar.zst Shaarli-b230bf207df576fa2ad165702184edf21f674ce7.zip |
Bump version to v0.9.0
Signed-off-by: ArthurHoaro <arthur@hoa.ro>
Diffstat (limited to 'doc/Server-configuration.html')
-rw-r--r-- | doc/Server-configuration.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index 2f1c25b5..0e6b220a 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html | |||
@@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf | |||
69 | <li><a href="Browsing-and-Searching.html">Browsing and Searching</a></li> | 69 | <li><a href="Browsing-and-Searching.html">Browsing and Searching</a></li> |
70 | <li><a href="Firefox-share.html">Firefox share</a></li> | 70 | <li><a href="Firefox-share.html">Firefox share</a></li> |
71 | <li><a href="RSS-feeds.html">RSS feeds</a></li> | 71 | <li><a href="RSS-feeds.html">RSS feeds</a></li> |
72 | <li><a href="REST-API.html">REST API</a></li> | ||
72 | </ul></li> | 73 | </ul></li> |
73 | <li>How To | 74 | <li>How To |
74 | <ul> | 75 | <ul> |
@@ -87,6 +88,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf | |||
87 | <li><a href="3rd-party-libraries.html">3rd party libraries</a></li> | 88 | <li><a href="3rd-party-libraries.html">3rd party libraries</a></li> |
88 | <li><a href="Plugin-System.html">Plugin System</a></li> | 89 | <li><a href="Plugin-System.html">Plugin System</a></li> |
89 | <li><a href="Release-Shaarli.html">Release Shaarli</a></li> | 90 | <li><a href="Release-Shaarli.html">Release Shaarli</a></li> |
91 | <li><a href="Versioning-and-Branches.html">Versioning and Branches</a></li> | ||
90 | <li><a href="Security.html">Security</a></li> | 92 | <li><a href="Security.html">Security</a></li> |
91 | <li><a href="Static-analysis.html">Static analysis</a></li> | 93 | <li><a href="Static-analysis.html">Static analysis</a></li> |
92 | <li><a href="Theming.html">Theming</a></li> | 94 | <li><a href="Theming.html">Theming</a></li> |
@@ -196,6 +198,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf | |||
196 | <h3 id="htaccess">.htaccess</h3> | 198 | <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> | 199 | <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> | 200 | <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> |
201 | <p>Apache module <code>mod_rewrite</code> <strong>must</strong> be enabled to use the REST API. URL rewriting rules for the Slim microframework are stated in the root <code>.htaccess</code> file.</p> | ||
199 | <h2 id="lighthttpd">LightHttpd</h2> | 202 | <h2 id="lighthttpd">LightHttpd</h2> |
200 | <h2 id="nginx">Nginx</h2> | 203 | <h2 id="nginx">Nginx</h2> |
201 | <h3 id="foreword">Foreword</h3> | 204 | <h3 id="foreword">Foreword</h3> |
@@ -296,11 +299,14 @@ http { | |||
296 | error_log /var/log/nginx/error.log; | 299 | error_log /var/log/nginx/error.log; |
297 | 300 | ||
298 | location /shaarli/ { | 301 | location /shaarli/ { |
302 | try_files $uri /shaarli/index.php$is_args$args; | ||
299 | access_log /var/log/nginx/shaarli.access.log; | 303 | access_log /var/log/nginx/shaarli.access.log; |
300 | error_log /var/log/nginx/shaarli.error.log; | 304 | error_log /var/log/nginx/shaarli.error.log; |
301 | } | 305 | } |
302 | 306 | ||
303 | location ~ (index)\.php$ { | 307 | location ~ (index)\.php$ { |
308 | try_files $uri =404; | ||
309 | fastcgi_split_path_info ^(.+\.php)(/.+)$; | ||
304 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; | 310 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; |
305 | fastcgi_index index.php; | 311 | fastcgi_index index.php; |
306 | include fastcgi.conf; | 312 | include fastcgi.conf; |
@@ -335,6 +341,10 @@ location ~ ~$ { | |||
335 | }</code></pre> | 341 | }</code></pre> |
336 | <pre class="nginx"><code># /etc/nginx/php.conf | 342 | <pre class="nginx"><code># /etc/nginx/php.conf |
337 | location ~ (index)\.php$ { | 343 | location ~ (index)\.php$ { |
344 | # Slim - split URL path into (script_filename, path_info) | ||
345 | try_files $uri =404; | ||
346 | fastcgi_split_path_info ^(.+\.php)(/.+)$; | ||
347 | |||
338 | # filter and proxy PHP requests to PHP-FPM | 348 | # filter and proxy PHP requests to PHP-FPM |
339 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; | 349 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; |
340 | fastcgi_index index.php; | 350 | fastcgi_index index.php; |
@@ -367,6 +377,9 @@ http { | |||
367 | server_name my.first.domain.org; | 377 | server_name my.first.domain.org; |
368 | 378 | ||
369 | location /shaarli/ { | 379 | location /shaarli/ { |
380 | # Slim - rewrite URLs | ||
381 | try_files $uri /shaarli/index.php$is_args$args; | ||
382 | |||
370 | access_log /var/log/nginx/shaarli.access.log; | 383 | access_log /var/log/nginx/shaarli.access.log; |
371 | error_log /var/log/nginx/shaarli.error.log; | 384 | error_log /var/log/nginx/shaarli.error.log; |
372 | } | 385 | } |
@@ -425,6 +438,9 @@ http { | |||
425 | ssl_certificate_key /home/john/ssl/localhost.key; | 438 | ssl_certificate_key /home/john/ssl/localhost.key; |
426 | 439 | ||
427 | location /shaarli/ { | 440 | location /shaarli/ { |
441 | # Slim - rewrite URLs | ||
442 | try_files $uri /index.php$is_args$args; | ||
443 | |||
428 | access_log /var/log/nginx/shaarli.access.log; | 444 | access_log /var/log/nginx/shaarli.access.log; |
429 | error_log /var/log/nginx/shaarli.error.log; | 445 | error_log /var/log/nginx/shaarli.error.log; |
430 | } | 446 | } |