X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=doc%2FServer-configuration.html;h=2f1c25b50f0ff78c6953cea7d87f0f5d4b790238;hb=455f776a3d0f9132e5a94160b5634111d44cade4;hp=e1edf557af264cd9c9583b53c24f8b4bf866b899;hpb=86deafe0ff5a22a37255546cf82325e89bf272b1;p=github%2Fshaarli%2FShaarli.git diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index e1edf557..2f1c25b5 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html @@ -52,18 +52,17 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
@@ -134,7 +131,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* InfSee also proxy-related issues.
<VirtualHost *:80>
+<VirtualHost *:80>
ServerName shaarli.my-domain.org
DocumentRoot /absolute/path/to/shaarli/
</VirtualHost>
@@ -145,11 +142,11 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
Apache/PHP - error log per VirtualHost (StackOverflow)
PHP: php_value vs php_admin_value and the use of php_flag explained
-<VirtualHost *:80>
+<VirtualHost *:80>
ServerName shaarli.my-domain.org
DocumentRoot /absolute/path/to/shaarli/
- LogLevel warn
+ LogLevel warn
ErrorLog /var/log/apache2/shaarli-error.log
CustomLog /var/log/apache2/shaarli-access.log combined
@@ -159,43 +156,46 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
php_value error_log /var/log/apache2/shaarli-php-error.log
</VirtualHost>
Standard - Keep access and error logs
-<VirtualHost *:80>
+<VirtualHost *:80>
ServerName shaarli.my-domain.org
DocumentRoot /absolute/path/to/shaarli/
- LogLevel warn
+ LogLevel warn
ErrorLog /var/log/apache2/shaarli-error.log
CustomLog /var/log/apache2/shaarli-access.log combined
</VirtualHost>
Paranoid - Redirect HTTP (:80) to HTTPS (:443)
See Server-side TLS (Mozilla).
-<VirtualHost *:443>
+<VirtualHost *:443>
ServerName shaarli.my-domain.org
DocumentRoot /absolute/path/to/shaarli/
- SSLEngine on
+ SSLEngine on
SSLCertificateFile /absolute/path/to/the/website/certificate.pem
SSLCertificateKeyFile /absolute/path/to/the/website/key.key
- <Directory /absolute/path/to/shaarli/>
- AllowOverride All
- Options Indexes FollowSymLinks MultiViews
- Order allow,deny
+ <Directory /absolute/path/to/shaarli/>
+ AllowOverride All
+ Options Indexes FollowSymLinks MultiViews
+ Order allow,deny
allow from all
</Directory>
- LogLevel warn
+ LogLevel warn
ErrorLog /var/log/apache2/shaarli-error.log
CustomLog /var/log/apache2/shaarli-access.log combined
</VirtualHost>
-<VirtualHost *:80>
+<VirtualHost *:80>
ServerName shaarli.my-domain.org
Redirect 301 / https://shaarli.my-domain.org
- LogLevel warn
+ LogLevel warn
ErrorLog /var/log/apache2/shaarli-error.log
CustomLog /var/log/apache2/shaarli-access.log combined
</VirtualHost>
+.htaccess
+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.
LightHttpd
Nginx
Foreword
@@ -236,7 +236,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
files may be located in a user's home directory
in this case, make sure both Nginx and PHP-FPM are running as the local user/group!
-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
,
@@ -254,6 +254,24 @@ user john users;
http {
[...][](.html)
}
+(Optional) Increase the maximum file upload size
+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
Minimal
WARNING: Use for development only!
user john users;
@@ -353,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;
@@ -406,15 +429,15 @@ 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;
}
}
-Restricting search engines and web crawler traffic
-Creating a robots.txt
witht he following contents at the root of your Shaarli installation will prevent "honest" web crawlers from indexing each and every link and Daily page from a Shaarli instance, thus getting rid of a certain amount of unsollicited network traffic.
-User-agent: *
-Disallow: /
-See: http://www.robotstxt.org/, http://www.robotstxt.org/robotstxt.html, http://www.robotstxt.org/meta.html