X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=doc%2FServer-configuration.html;h=2f1c25b50f0ff78c6953cea7d87f0f5d4b790238;hb=3cc8c898307ad53507a128db2b11238be2641c32;hp=068900b88ee35484b05adf831c30e55881f07712;hpb=adcdac1dec45090e2fa1cd4a340e91a40c7a205f;p=github%2Fshaarli%2FShaarli.git 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 ErrorLog /var/log/apache2/shaarli-error.log CustomLog /var/log/apache2/shaarli-access.log combined </VirtualHost> +
Shaarli use .htaccess
Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive AllowOverride All
in your virtual host configuration for them to work.
Warning: If you use Apache 2.2 or lower, you need mod_version to be installed and enabled.
For all following examples, a development configuration will be used:
+For all following configuration examples, this user/group pair will be used:
user:group = john:users
,Some bookmark dumps generated by web browsers can be huge due to the presence of Base64-encoded images and favicons, as well as extra verbosity when nesting links in (sub-)folders.
+To increase upload size, you will need to modify both nginx and PHP configuration:
+# /etc/nginx/nginx.conf
+
+http {
+ [...][](.html)
+
+ client_max_body_size 10m;
+
+ [...][](.html)
+}
+# /etc/php5/fpm/php.ini
+
+[...][](.html)
+post_max_size = 10M
+[...][](.html)
+upload_max_filesize = 10M
WARNING: Use for development only!
user john users;
@@ -350,6 +371,11 @@ http {
error_log /var/log/nginx/shaarli.error.log;
}
+ location = /shaarli/favicon.ico {
+ # serve the Shaarli favicon from its custom location
+ alias /var/www/shaarli/images/favicon.ico;
+ }
+
include deny.conf;
include static_assets.conf;
include php.conf;
@@ -403,6 +429,11 @@ http {
error_log /var/log/nginx/shaarli.error.log;
}
+ location = /shaarli/favicon.ico {
+ # serve the Shaarli favicon from its custom location
+ alias /var/www/shaarli/images/favicon.ico;
+ }
+
include deny.conf;
include static_assets.conf;
include php.conf;