-
Notifications
You must be signed in to change notification settings - Fork 42
Feature: Add section about Cryptomator desktop network settings #66
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| .. _desktop/network: | ||
|
|
||
| Network Settings | ||
| ================ | ||
|
|
||
| In general, Cryptomator does not require a network connection to function. | ||
|
|
||
| If the network connection is present, it is used for optional features, i.e. update checks and searching the error database for solutions. | ||
| The only exception is when unlocking :ref:`Cryptomator Hub <hub/introduction>` vaults, then a network connection to the hub server is required. | ||
| All network connections to the internet are using HTTPS with at least TLS 1.2. | ||
|
|
||
|
|
||
| .. _desktop/network/trust-certificate-management: | ||
|
|
||
| Trust Certificate Management | ||
| ----------------------------- | ||
| Depending on the OS, the required trusted root certificates are loaded from different locations. | ||
|
|
||
| +---------+--------------------------------------------------------------------------------------------------------------------------------+ | ||
| | OS | Trust store | | ||
| +=========+================================================================================================================================+ | ||
| | Linux | | PKCS#12 file ``/etc/cryptomator/certs.p12``; If the file does not exist, the JDK default | | ||
| | | | trust store is used. [1]_ | | ||
| +---------+--------------------------------------------------------------------------------------------------------------------------------+ | ||
| | macOS | System keychain | | ||
| +---------+--------------------------------------------------------------------------------------------------------------------------------+ | ||
| | Windows | | Certificate store "Trusted Root Certification Authorities", with registry path | | ||
| | | | ``HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates\ROOT\`` | | ||
| +---------+--------------------------------------------------------------------------------------------------------------------------------+ | ||
|
|
||
| Remarks: | ||
|
|
||
| .. [1] For more information about the location and contained certificates, see `JEP 319 <https://openjdk.org/jeps/319>`_. | ||
|
|
||
|
|
||
| .. _desktop/network/proxy-server: | ||
|
|
||
| Proxy Server | ||
| ------------ | ||
| The default proxy server differs depending on the operating system: | ||
|
|
||
| +---------+-----------------------+ | ||
| | OS | Default proxy setting | | ||
| +=========+=======================+ | ||
| | Linux | No proxy | | ||
| +---------+-----------------------+ | ||
| | macOS | Use system proxy | | ||
| +---------+-----------------------+ | ||
| | Windows | Use system proxy | | ||
| +---------+-----------------------+ | ||
|
|
||
|
|
||
| To change the proxy server, you need to edit :ref:`Cryptomator.cfg <desktop/advanced-settings/locating-system-wide-advanced-configuration>`. | ||
| Open the file in a text editor, search for the line:: | ||
|
|
||
| java-options=-Djava.net.useSystemProxies=true | ||
|
|
||
| and *if it exists*, only replace the word ``true`` with ``false``. | ||
|
|
||
| In the second step, add the following lines to the end of the file:: | ||
|
|
||
| java-options=-Dhttp.proxyHost=[1] | ||
| java-options=-Dhttp.proxyPort=[2] | ||
| java-options=-Dhttps.proxyHost=[1] | ||
| java-options=-Dhttps.proxyPort=[2] | ||
| java-options=-Dhttp.nonProxyHosts=localhost|127.0.0.1|cryptomator-vault|[3] | ||
|
|
||
| and replace ``[1]`` with the host address of the proxy server, ``[2]`` with the port used on the proxy server and ``[3]`` with the list of host addresses, which should not use the proxy server, separated by '|'. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,8 @@ | |
|
|
||
| | | ||
|
|
||
| .. _hub/introduction: | ||
|
|
||
| *************** | ||
| Cryptomator Hub | ||
| *************** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.