From aab78fea355d18e43565759bbb89fc181d8931a5 Mon Sep 17 00:00:00 2001 From: Daniel Pan Date: Wed, 20 Mar 2024 22:35:38 +0800 Subject: [PATCH] Clean document on enabling https with Nginx and Apache --- manual/deploy/https_with_apache.md | 22 ++++++++++------------ manual/deploy/https_with_nginx.md | 18 ++++++++---------- manual/deploy/using_mysql.md | 3 --- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/manual/deploy/https_with_apache.md b/manual/deploy/https_with_apache.md index 3e3e2b6d..2a746300 100644 --- a/manual/deploy/https_with_apache.md +++ b/manual/deploy/https_with_apache.md @@ -144,25 +144,23 @@ Finally, make sure the virtual host file does not contain syntax errors and rest sudo service apache2 restart ``` -### Modifying ccnet.conf - -The `SERVICE_URL` in [ccnet.conf](../../config/ccnet-conf.md) informs Seafile about the chosen domain, protocol and port. Change the `SERVICE_URL`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the `http://`must not be removed): - -```ini -SERVICE_URL = https://seafile.example.com -``` - -Note: The`SERVICE_URL` can also be modified in Seahub via System Admininstration > Settings. If `SERVICE_URL` is configured via System Admin and in ccnet.conf, the value in System Admin will take precedence. - ### Modifying seahub_settings.py -The `FILE_SERVER_ROOT` in [seahub_settings.py](../../config/seahub_settings_py) informs Seafile about the location of and the protocol used by the file server. Change the `FILE_SERVER_ROOT`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the trailing `/seafhttp` must not be removed): +The `SERVICE_URL` in [seahub_settings.py](../config/seahub_settings_py/) informs Seafile about the chosen domain, protocol and port. Change the `SERVICE_URL`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the `http://`must not be removed): + + +```python +SERVICE_URL = 'https://seafile.example.com' +``` + +The `FILE_SERVER_ROOT` in [seahub_settings.py](../config/seahub_settings_py/) informs Seafile about the location of and the protocol used by the file server. Change the `FILE_SERVER_ROOT`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the trailing `/seafhttp` must not be removed): ```python FILE_SERVER_ROOT = 'https://seafile.example.com/seafhttp' ``` -Note: The`FILE_SERVER_ROOT` can also be modified in Seahub via System Admininstration > Settings. If `FILE_SERVER_ROOT` is configured via System Admin and in seahub_settings.py, the value in System Admin will take precedence. +Note: The `SERVICE_URL` and `FILE_SERVER_ROOT` can also be modified in Seahub via System Admininstration > Settings. If they are configured via System Admin and in seahub_settings.py, the value in System Admin will take precedence. + ### Modifying seafile.conf (optional) diff --git a/manual/deploy/https_with_nginx.md b/manual/deploy/https_with_nginx.md index 7c2f09b4..024fbc77 100644 --- a/manual/deploy/https_with_nginx.md +++ b/manual/deploy/https_with_nginx.md @@ -243,25 +243,23 @@ If you have WebDAV enabled it is recommended to add the same: } ``` -### Modifying ccnet.conf - -The `SERVICE_URL` in [ccnet.conf](../config/ccnet-conf.md) informs Seafile about the chosen domain, protocol and port. Change the `SERVICE_URL`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the `http://`must not be removed): - -```ini -SERVICE_URL = https://seafile.example.com -``` - -Note: The`SERVICE_URL` can also be modified in Seahub via System Admininstration > Settings. If `SERVICE_URL` is configured via System Admin and in ccnet.conf, the value in System Admin will take precedence. ### Modifying seahub_settings.py +The `SERVICE_URL` in [seahub_settings.py](../config/seahub_settings_py/) informs Seafile about the chosen domain, protocol and port. Change the `SERVICE_URL`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the `http://`must not be removed): + + +```python +SERVICE_URL = 'https://seafile.example.com' +``` + The `FILE_SERVER_ROOT` in [seahub_settings.py](../config/seahub_settings_py/) informs Seafile about the location of and the protocol used by the file server. Change the `FILE_SERVER_ROOT`so as to account for the switch from HTTP to HTTPS and to correspond to your host name (the trailing `/seafhttp` must not be removed): ```python FILE_SERVER_ROOT = 'https://seafile.example.com/seafhttp' ``` -Note: The`FILE_SERVER_ROOT` can also be modified in Seahub via System Admininstration > Settings. If `FILE_SERVER_ROOT` is configured via System Admin and in seahub_settings.py, the value in System Admin will take precedence. +Note: The `SERVICE_URL` and `FILE_SERVER_ROOT` can also be modified in Seahub via System Admininstration > Settings. If they are configured via System Admin and in seahub_settings.py, the value in System Admin will take precedence. ### Modifying seafile.conf (optional) diff --git a/manual/deploy/using_mysql.md b/manual/deploy/using_mysql.md index 58314c0a..6cff9bbc 100644 --- a/manual/deploy/using_mysql.md +++ b/manual/deploy/using_mysql.md @@ -412,7 +412,4 @@ This manual provides instructions for enabling HTTPS for the two most popular we * [Apache](https://manual.seafile.com/deploy/https_with_apache/) -## Performance tuning - -If you have more than 50 users, we highly recommand you to [add memcached](../deploy/add_memcached.md). This is going to greatly speed up Seahub (the web frontend).