diff --git a/site/source/_static/images/ssl/macos/mac-lan-setup0.png b/site/source/_static/images/ssl/macos/mac-lan-setup0.png index ab16f14..ab7376e 100644 Binary files a/site/source/_static/images/ssl/macos/mac-lan-setup0.png and b/site/source/_static/images/ssl/macos/mac-lan-setup0.png 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 new file mode 100644 index 0000000..b4e74b0 Binary files /dev/null and b/site/source/_static/images/ssl/macos/mac-lan-setup1.png 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 new file mode 100644 index 0000000..ab16f14 Binary files /dev/null and b/site/source/_static/images/ssl/macos/mac-lan-setup2.png differ diff --git a/site/source/_static/images/tor/applyproxy.png b/site/source/_static/images/tor/applyproxy.png index 694e2c9..1405f54 100644 Binary files a/site/source/_static/images/tor/applyproxy.png and b/site/source/_static/images/tor/applyproxy.png differ diff --git a/site/source/_static/images/tor/entertorproxyURL.png b/site/source/_static/images/tor/entertorproxyURL.png index 3719c12..55a235d 100644 Binary files a/site/source/_static/images/tor/entertorproxyURL.png and b/site/source/_static/images/tor/entertorproxyURL.png differ diff --git a/site/source/_static/images/tor/firefox_options_windows.png b/site/source/_static/images/tor/firefox_options_windows.png index d7b742b..82fdb0a 100644 Binary files a/site/source/_static/images/tor/firefox_options_windows.png and b/site/source/_static/images/tor/firefox_options_windows.png differ diff --git a/site/source/_static/images/tor/firefox_proxy_windows.png b/site/source/_static/images/tor/firefox_proxy_windows.png new file mode 100644 index 0000000..10936db Binary files /dev/null and b/site/source/_static/images/tor/firefox_proxy_windows.png differ diff --git a/site/source/_static/images/tor/install_homebrew.png b/site/source/_static/images/tor/install_homebrew.png index ce397f6..a835cf6 100644 Binary files a/site/source/_static/images/tor/install_homebrew.png and b/site/source/_static/images/tor/install_homebrew.png differ diff --git a/site/source/_static/images/tor/proxys.png b/site/source/_static/images/tor/proxys.png index 6d5c19d..69cc434 100644 Binary files a/site/source/_static/images/tor/proxys.png and b/site/source/_static/images/tor/proxys.png differ diff --git a/site/source/_static/images/tor/systemSettings.png b/site/source/_static/images/tor/systemSettings.png new file mode 100644 index 0000000..146ec53 Binary files /dev/null and b/site/source/_static/images/tor/systemSettings.png differ diff --git a/site/source/_static/images/tor/systemprefs.png b/site/source/_static/images/tor/systemprefs.png index 11ef8dc..9707fa4 100644 Binary files a/site/source/_static/images/tor/systemprefs.png and b/site/source/_static/images/tor/systemprefs.png differ diff --git a/site/source/_static/images/tor/ventura-network-advanced.png b/site/source/_static/images/tor/ventura-network-advanced.png new file mode 100644 index 0000000..5186e64 Binary files /dev/null and b/site/source/_static/images/tor/ventura-network-advanced.png differ diff --git a/site/source/_static/images/tor/ventura-proxies.png b/site/source/_static/images/tor/ventura-proxies.png new file mode 100644 index 0000000..3ecc64a Binary files /dev/null and b/site/source/_static/images/tor/ventura-proxies.png differ diff --git a/site/source/_static/images/tor/ventura-settings.png b/site/source/_static/images/tor/ventura-settings.png new file mode 100644 index 0000000..b3146cb Binary files /dev/null and b/site/source/_static/images/tor/ventura-settings.png differ diff --git a/site/source/user-manual/connecting/connecting-lan/index.rst b/site/source/user-manual/connecting/connecting-lan/index.rst index 3ac0262..8c5f94d 100644 --- a/site/source/user-manual/connecting/connecting-lan/index.rst +++ b/site/source/user-manual/connecting/connecting-lan/index.rst @@ -11,13 +11,6 @@ Whenever you are connected the same Local Area Network (LAN) as your Embassy (i. Download Root CA ---------------- -Video Guide: - - .. youtube:: aZYGVFBicbs - :width: 100% - - - First, download your Embassy's Root CA. There are two way to accomplish this: Option 1 diff --git a/site/source/user-manual/connecting/connecting-lan/lan-browser/lan-brave.rst b/site/source/user-manual/connecting/connecting-lan/lan-browser/lan-brave.rst index 91a9171..bafc553 100644 --- a/site/source/user-manual/connecting/connecting-lan/lan-browser/lan-brave.rst +++ b/site/source/user-manual/connecting/connecting-lan/lan-browser/lan-brave.rst @@ -8,7 +8,7 @@ Trust Embassy CA in Brave .. tabs:: - .. group-tab:: Linux / macOS + .. group-tab:: Linux #. Open a new tab in Brave and open to "Settings" from the top-right hamburger menu. @@ -115,4 +115,8 @@ Trust Embassy CA in Brave .. figure:: /_static/images/ssl/windows/windows_certificates_caimport_step9.jpg :width: 40% - :alt: Windows Certificates CA Cert Import Step 9 \ No newline at end of file + :alt: Windows Certificates CA Cert Import Step 9 + + .. group-tab:: Mac + + No additional setup is required for Brave on MacOS \ No newline at end of file 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 d6bd2f3..dbd8c6b 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 @@ -4,19 +4,20 @@ Trusting Embassy CA on Mac ========================== -Video Guide: - .. youtube:: sErA23Ii5To - :width: 100% +#. In your Embassy, head to *System* -> *Lan* -> click *Download Certificate* and save it to your Mac. -#. Locate your Embassy's Root CA, right click, then click *Open with > Keychain Access*. - - .. figure:: /_static/images/ssl/embassy_lan_setup1.png + .. figure:: /_static/images/ssl/macos/mac-lan-setup0.png :width: 60% :alt: LAN setup prompt +#. Locate the certificate and double click it. + + .. figure:: /_static/images/ssl/macos/mac-lan-setup1.png + :width: 60% + #. In the resulting box, choose "System" from the "Keychain" dropdown menu. Then click "Add." - .. figure:: /_static/images/ssl/macos/mac-lan-setup0.png + .. figure:: /_static/images/ssl/macos/mac-lan-setup2.png :width: 60% :alt: System Keychain diff --git a/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-windows.rst b/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-windows.rst index 042d57f..d21c9b8 100644 --- a/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-windows.rst +++ b/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-windows.rst @@ -22,7 +22,7 @@ Configuring Firefox for Tor on Windows C:\Program Files\Tor Browser\proxy.pac -#. Now, back in your Firefox web browser, select "Options" from the right-hand hamburger menu: +#. Now, back in your Firefox web browser, select "Settings" from the right-hand hamburger menu: .. figure:: /_static/images/tor/firefox_options_windows.png :width: 60% @@ -42,7 +42,7 @@ Configuring Firefox for Tor on Windows #. Then, check the box labeled "Proxy DNS when using SOCKS v5": - .. figure:: /_static/images/tor/firefox_proxy.png + .. figure:: /_static/images/tor/firefox_proxy_windows.png :width: 60% :alt: Firefox proxy settings screenshot diff --git a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-mac.rst b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-mac.rst index b962d1d..081613f 100644 --- a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-mac.rst +++ b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-mac.rst @@ -13,8 +13,6 @@ Install Homebrew /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - .. note:: On new (M1) Macs, you might need to be root for this in which case add ``sudo`` at the front of the command, with a space before ``/bin/bash`` - #. You will be prompted for your system password before installation; proceed with entering your password. You may be asked more than once. .. figure:: /_static/images/tor/install_homebrew.png @@ -56,54 +54,92 @@ This will start Tor and ensure that it is always running, even after a restart. Enable Tor System-wide ---------------------- -#. Now enable apache service: +.. tabs:: - .. code-block:: + .. group-tab:: Ventura - sudo launchctl load -w /System/Library/LaunchDaemons/org.apache.httpd.plist + #. Enable proxy autoconfig file (This will download the Start9 standard proxy config file. You can use your own if you prefer): -#. Enable proxy autoconfig file (This will download the Start9 standard proxy config file. You can use your own if you prefer): + .. code-block:: - .. code-block:: + sudo curl https://registry.start9labs.com/sys/proxy.pac --output /Library/WebServer/Documents/proxy.pac - sudo curl https://registry.start9labs.com/sys/proxy.pac --output /Library/WebServer/Documents/proxy.pac + #. Go to System Settings: -#. Go to system preferences: + .. figure:: /_static/images/tor/systemSettings.png + :width: 40% + :alt: System Preferences - .. figure:: /_static/images/tor/systemprefs.png - :width: 40% - :alt: System Preferences + #. Click on *Network* and then select the interface on which you wish to enable Tor system-wide (both Ethernet and WiFi advised - do one then the other): -#. Click on Network: + .. figure:: /_static/images/tor/ventura-settings.png + :width: 80% + :alt: Select Network - .. figure:: /_static/images/tor/network.png - :width: 80% - :alt: Select Network + #. Click *Details*: -#. In this example, we'll select WiFi on the left panel. If you're using Ethernet, click that instead. Next click "Advanced": + .. figure:: /_static/images/tor/ventura-network-advanced.png + :width: 80% + :alt: Click Advanced - .. figure:: /_static/images/tor/wifi_click_advanced.png - :width: 80% - :alt: Click Advanced + #. Select *Proxies*, toggle *Automatic proxy configuration* and enter **file:////Library/WebServer/Documents/proxy.pac** then click *OK*: -#. Select "Proxies": + .. figure:: /_static/images/tor/ventura-proxies.png + :width: 80% + :alt: Select Proxys - .. figure:: /_static/images/tor/proxys.png - :width: 80% - :alt: Select Proxys + Done! You have now enabled system-wide Tor potential. -#. Select "Automatic Proxy Configuration", add this URL: http://localhost/proxy.pac then click "OK" + We advise going back to step three and repeating this for Wifi/Ethernet depending on which interface you haven't done yet. - .. figure:: /_static/images/tor/entertorproxyURL.png - :width: 80% - :alt: Select Automatic proxy config and enter URL + If you'd like to setup Firefox to use Tor you can follow :ref:`this guide`. -#. Finally, click "Apply" + .. group-tab:: Pre-Ventura - .. figure:: /_static/images/tor/applyproxy.png - :width: 80% - :alt: Apply proxy + #. Enable proxy autoconfig file (This will download the Start9 standard proxy config file. You can use your own if you prefer): -Done! You have now enabled system-wide Tor potential. + .. code-block:: -If you'd like to setup Firefox to use Tor you can follow :ref:`this guide`. \ No newline at end of file + sudo curl https://registry.start9labs.com/sys/proxy.pac --output /Library/WebServer/Documents/proxy.pac + + #. Go to System Preferences: + + .. figure:: /_static/images/tor/systemprefs.png + :width: 40% + :alt: System Preferences + + #. Click on Network: + + .. figure:: /_static/images/tor/network.png + :width: 80% + :alt: Select Network + + #. In this example, we'll select WiFi on the left panel. If you're using Ethernet, click that instead. Next click "Advanced" (We suggest returning to this step in order to do both Ethernet AND WiFi): + + .. figure:: /_static/images/tor/wifi_click_advanced.png + :width: 80% + :alt: Click Advanced + + #. Select "Proxies": + + .. figure:: /_static/images/tor/proxys.png + :width: 80% + :alt: Select Proxys + + #. Select "Automatic Proxy Configuration", add this URL: **file:////Library/WebServer/Documents/proxy.pac** then click "OK" + + .. figure:: /_static/images/tor/entertorproxyURL.png + :width: 80% + :alt: Select Automatic proxy config and enter URL + + #. Finally, click "Apply" + + .. figure:: /_static/images/tor/applyproxy.png + :width: 80% + :alt: Apply proxy + + Done! You have now enabled system-wide Tor potential. + + We suggest heading back to Step 4 and enabling Tor system-wide on Ethernet/WiFi now - whichever you did not do already. + + If you'd like to setup Firefox to use Tor you can follow :ref:`this guide`. \ No newline at end of file