diff options
author | VirtualTam <virtualtam@flibidi.net> | 2015-09-04 21:35:27 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2015-09-04 21:35:27 +0200 |
commit | bb91a8c6e8649d482a552b64c6a0c8e65c6becd7 (patch) | |
tree | 8a6fcc4cd511aad9b1f24df32bdcfe810419172f /doc/Server-configuration.html | |
parent | ce8c4a84ba180802ca6e5f00f60353ad71d3fcc8 (diff) | |
parent | f8b936e7e75601b5d96525f25d5b52dbabd909b4 (diff) | |
download | Shaarli-bb91a8c6e8649d482a552b64c6a0c8e65c6becd7.tar.gz Shaarli-bb91a8c6e8649d482a552b64c6a0c8e65c6becd7.tar.zst Shaarli-bb91a8c6e8649d482a552b64c6a0c8e65c6becd7.zip |
Merge pull request #340 from virtualtam/doc/update
Doc: sync from Wiki, generate HTML
Diffstat (limited to 'doc/Server-configuration.html')
-rw-r--r-- | doc/Server-configuration.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index e4e383a3..3aa89722 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html | |||
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; } | |||
36 | <li><a href="Home.html">Home</a></li> | 36 | <li><a href="Home.html">Home</a></li> |
37 | <li>Installation | 37 | <li>Installation |
38 | <ul> | 38 | <ul> |
39 | <li><a href="Download.html">Download</a></li> | ||
39 | <li><a href="Server-requirements.html">Server requirements</a></li> | 40 | <li><a href="Server-requirements.html">Server requirements</a></li> |
40 | <li><a href="Server-configuration.html">Server configuration</a></li> | 41 | <li><a href="Server-configuration.html">Server configuration</a></li> |
41 | <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> | 42 | <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> |
@@ -279,10 +280,15 @@ location ~ ~$ { | |||
279 | }</code></pre> | 280 | }</code></pre> |
280 | <pre class="nginx"><code># /etc/nginx/php.conf | 281 | <pre class="nginx"><code># /etc/nginx/php.conf |
281 | location ~ (index)\.php$ { | 282 | location ~ (index)\.php$ { |
282 | # proxy PHP requests to PHP-FPM | 283 | # filter and proxy PHP requests to PHP-FPM |
283 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; | 284 | fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; |
284 | fastcgi_index index.php; | 285 | fastcgi_index index.php; |
285 | include fastcgi.conf; | 286 | include fastcgi.conf; |
287 | } | ||
288 | |||
289 | location ~ \.php$ { | ||
290 | # deny access to all other PHP scripts | ||
291 | deny all; | ||
286 | }</code></pre> | 292 | }</code></pre> |
287 | <pre class="nginx"><code># /etc/nginx/static_assets.conf | 293 | <pre class="nginx"><code># /etc/nginx/static_assets.conf |
288 | location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { | 294 | location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { |