diff --git a/site/source/_static/images/ssl/macos/always_trust.png b/site/source/_static/images/ssl/macos/always_trust.png deleted file mode 100644 index 07cff0f..0000000 Binary files a/site/source/_static/images/ssl/macos/always_trust.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/certificate_trusted.png b/site/source/_static/images/ssl/macos/certificate_trusted.png deleted file mode 100644 index 68094c3..0000000 Binary files a/site/source/_static/images/ssl/macos/certificate_trusted.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/certificate_untrusted.png b/site/source/_static/images/ssl/macos/certificate_untrusted.png deleted file mode 100644 index bd822da..0000000 Binary files a/site/source/_static/images/ssl/macos/certificate_untrusted.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/mac-lan-setup0.png b/site/source/_static/images/ssl/macos/mac-lan-setup0.png deleted file mode 100644 index ab7376e..0000000 Binary files a/site/source/_static/images/ssl/macos/mac-lan-setup0.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/mac-lan-setup1.png b/site/source/_static/images/ssl/macos/mac-lan-setup1.png deleted file mode 100644 index b4e74b0..0000000 Binary files a/site/source/_static/images/ssl/macos/mac-lan-setup1.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/mac-lan-setup2.png b/site/source/_static/images/ssl/macos/mac-lan-setup2.png deleted file mode 100644 index ab16f14..0000000 Binary files a/site/source/_static/images/ssl/macos/mac-lan-setup2.png and /dev/null differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-1-system-lan.png b/site/source/_static/images/ssl/macos/trust-cert-macos-1-system-lan.png new file mode 100644 index 0000000..2cca62b Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-1-system-lan.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-2-download_cert.png b/site/source/_static/images/ssl/macos/trust-cert-macos-2-download_cert.png new file mode 100644 index 0000000..6275d90 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-2-download_cert.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-3-show_in_folder.png b/site/source/_static/images/ssl/macos/trust-cert-macos-3-show_in_folder.png new file mode 100644 index 0000000..9eae800 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-3-show_in_folder.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-4-modify_keychain.png b/site/source/_static/images/ssl/macos/trust-cert-macos-4-modify_keychain.png new file mode 100644 index 0000000..1cb3fa6 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-4-modify_keychain.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-5-cert-get_info.png b/site/source/_static/images/ssl/macos/trust-cert-macos-5-cert-get_info.png new file mode 100644 index 0000000..0f961c7 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-5-cert-get_info.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-6-ssl_tls-always_trust.png b/site/source/_static/images/ssl/macos/trust-cert-macos-6-ssl_tls-always_trust.png new file mode 100644 index 0000000..8c2a39c Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-6-ssl_tls-always_trust.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-7-password-update_settings.png b/site/source/_static/images/ssl/macos/trust-cert-macos-7-password-update_settings.png new file mode 100644 index 0000000..7ab7f46 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-7-password-update_settings.png differ diff --git a/site/source/_static/images/ssl/macos/trust-cert-macos-8-cert_trusted.png b/site/source/_static/images/ssl/macos/trust-cert-macos-8-cert_trusted.png new file mode 100644 index 0000000..0275327 Binary files /dev/null and b/site/source/_static/images/ssl/macos/trust-cert-macos-8-cert_trusted.png differ diff --git a/site/source/user-manual/connecting/connecting-lan/lan-os/lan-mac.rst b/site/source/user-manual/connecting/connecting-lan/lan-os/lan-mac.rst index 910186f..1214234 100644 --- a/site/source/user-manual/connecting/connecting-lan/lan-os/lan-mac.rst +++ b/site/source/user-manual/connecting/connecting-lan/lan-os/lan-mac.rst @@ -1,49 +1,59 @@ .. _lan-mac: -============================== -Trusting Your Start9 CA on Mac -============================== +================================ +Trusting Your Start9 CA on macOS +================================ -#. In your Start9 server's UI, navigate to *System* -> *Lan* -> click *Download Certificate* and save it to your Mac. +#. In your Start9 server's UI, navigate to **System** -> **LAN** - .. figure:: /_static/images/ssl/macos/mac-lan-setup0.png + .. figure:: /_static/images/ssl/macos/trust-cert-macos-1-system-lan.png :width: 60% - :alt: LAN setup prompt + :alt: Navigate to System > LAN -#. Locate the certificate and double click it. +#. Click **Download Certificate** and your browser will either automatically save the certificate to your Downloads folder or ask you where to save it: - .. figure:: /_static/images/ssl/macos/mac-lan-setup1.png + .. figure:: /_static/images/ssl/macos/trust-cert-macos-2-download_cert.png + :width: 60% + :alt: Download Certificate + +#. Among the browser's downloads, right click your certificate file and select *Show in Folder*: + + .. figure:: /_static/images/ssl/macos/trust-cert-macos-3-show_in_folder.png + :width: 60% + :alt: Show certificate file in Downloads folder + +#. Finder will open. Locate your unique `adjective-noun Local CA.crt` file in your *Downloads* folder and double click it to open it in the Keychain Access program. You will be prompted for your macOS username and password, or thumbprint. Then select *Modify Keychain*: + + .. figure:: /_static/images/ssl/macos/trust-cert-macos-4-modify_keychain.png :width: 60% -#. In the resulting box, choose "System" from the "Keychain" dropdown menu. Then click "Add." +#. Your server's CA certificate will be displayed among the imported certificates in Keychain Access. Right-click on the imported CA cert and select *Get Info*: - .. figure:: /_static/images/ssl/macos/mac-lan-setup2.png + .. figure:: /_static/images/ssl/macos/trust-cert-macos-5-cert-get_info.png :width: 60% - :alt: System Keychain + :alt: Keychain Access - Get Info of CA Certificate -#. Enter your computer password when prompted. It will be imported into your mac's keychain. +#. The details of your CA certificate will be displayed in a new dialog window. Expand the **Trust** heading, then select "**Always Trust**" on **Secure Sockets Layer (SSL)** and **X.509 Basic Policy**. - .. figure:: /_static/images/ssl/macos/certificate_untrusted.png + .. figure:: /_static/images/ssl/macos/trust-cert-macos-6-ssl_tls-always_trust.png :width: 60% - :alt: Keychain access import menu + :alt: Trust CA Certificate - .. note:: If the keychain console did not open, press "Command + spacebar" and type “Keychain Access”, and hit enter to open it. + Click the red (x) button at the top left of the Local Root CA dialog window. -#. Navigate to the "System" tab on the left, find the certificate named as a custom ``adjective-noun.local.crt``, and double click on this certificate. A second window will pop up. +#. You will then be prompted again for your username and password, or thumbprint. Enter those and click **Update Settings**: -#. Open the "Trust" dropdown and select "Always Trust" from the dropdown next to "When using this certificate". + .. figure:: /_static/images/ssl/macos/trust-cert-macos-7-password-update_settings.png + :width: 60% + :alt: Authenticate to change the settings - .. figure:: /_static/images/ssl/macos/always_trust.png +#. You will see your server's CA certificate as trusted now, signified by a blue (+) sign and the CA cert information will now say "This certificate is marked as trusted for all users" in Keychain Access: + + .. figure:: /_static/images/ssl/macos/trust-cert-macos-8-cert_trusted.png :width: 60% :alt: Keychain submenu -#. Close this window and enter your password to apply the settings. - -#. The unique ``adjective-noun.local.crt`` cert will now read "This certificate is marked as trusted for all users" in Keychain Access. - - .. figure:: /_static/images/ssl/macos/certificate_trusted.png - :width: 60% - :alt: Keychain menu trusted certificate + .. tip:: If the keychain console did not show the certificate as trusted, press "Command + spacebar" and type “Keychain Access”, and hit enter to re-open it. No additional setup is required for most browsers and you will now be able to safely connect to your Start9 server over LAN.