Browse files

Detail the VPNs and explain which VPN does what

  • Loading branch information...
1 parent d8465ab commit e52588fbce40a7cefc7d3f49f36e7696fbffbf5b @tofumatt tofumatt committed Jun 6, 2011
Showing with 14 additions and 2 deletions.
  1. +14 −2 docs/servers.rst
View
16 docs/servers.rst
@@ -10,7 +10,8 @@ option is available.
**cm-webdev01-master01** is the webdev mysql server. See :ref:`db-cluster`.
-**cm-vpn01** is where our server logs are copied.
+**cm-vpn01** is where our server logs are copied. Note that you need to file
+a bug to get access to this server.
Served Environments
-------------------
@@ -24,11 +25,22 @@ There are two or three main environments for our web sites:
* This is what will go live to production.
* **production**
+.. _vpn-info:
+
VPN
---
-To get to any Mozilla servers you will need VPN access.
+To get to any Mozilla servers you will need VPN access. There are two VPN
+networks: Mozilla-MV (Mountain View office VPN) and Mozilla MPT (for access
+to khan, staging servers, etc.).
+
+If you want to use Mozilla's shared network volumes (like ``fs2``) you can
+connect to the Mozilla-MV VPN.
+
+If you need to access khan, database servers, or the cm-vpn01 server, connect
+to Mozilla MPT.
We recommend Viscosity_ for VPN.
+
.. _Viscosity: https://intranet.mozilla.org/IT_MPT-RemoteAccess#Viscosity_.28TunnelBlick_alternative.29

0 comments on commit e52588f

Please sign in to comment.