Add ETH vs PHYS account

account/authentication.markdown

+# Authentication
+
+## Usernames
+
+## Passwords
+
+| Service            | Link                                                                                     | Username               | Password                 |
+|--------------------|------------------------------------------------------------------------------------------|------------------------|--------------------------|
+| Main Website       | [www.ethz.ch](https://www.ethz.ch/)                                                      | `<ETH username>`       | `<ETH password>`         |
+| ETHIS (SAP)        | [ethis.ethz.ch](http://ethis.ethz.ch/)                                                   | `<ETH username>`       | `<ETH password>`         |
+| Printing           | [print.ethz.ch](https://print.ethz.ch/)                                                  | `<ETH username>`       | `<ETH password>`         |
+| Network printing   | [pia02.d.ethz.ch](https://pia02.d.ethz.ch/)                                              | `d\<ETH username>`     | `<ETH password>`         |
+| ETH Webmail        | [mail.ethz.ch](https://mail.ethz.ch/)                                                    | `<ETH username>`       | `<ETH password>`         |
+| IT Shop (Software) | [ides](https://idesnx.ethz.ch/)                                                          | `<ETH username>`       | `<ETH password>`         |
+| Wi-Fi (Wireless)   | [Wi-Fi Howto](https://www.ethz.ch/services/en/it-services/service-desk/wifi-change.html) | `<ETH username>@<net>` | `<ETH network password>` |
+| VPN                | [WebVPN](https://sslvpn.ethz.ch/)                                                        | `<ETH username>@<net>` | `<ETH network password>` |

account/index.markdown

-Physics Account
-===============
+# Account Types
+
+At the D-PHYS you usually have two accounts:
+
+- **ETH Account** (nethz Account): All ETH members
+- **D-PHYS Account** (Physics Account): All employees, most students, collaborators
+
+## ETH Account
+
+The **ETH Account** (nethz Account) is required for the following services:
+
+| Service            | Link / Docu                                                        | Description                         |
+|--------------------|--------------------------------------------------------------------|-------------------------------------|
+| Main Website       | [www.ethz.ch](https://www.ethz.ch/)                                | ETH Websites (*.ethz.ch)            |
+| ETHIS (SAP)        | [ethis.ethz.ch](https://ethis.ethz.ch/)                            | ETH Information and Support System  |
+| Printing           | [[printing/]]                                                      | Web-/network printing               |
+| ETH E-Mail         | [mail.ethz.ch](https://mail.ethz.ch/)                              | Mailbox: @ethz.ch, @student.ethz.ch |
+| IT Shop (Software) | [ides](https://idesnx.ethz.ch/)                                    | Licensed Software Catalog           |
+| Network            | [[network/]]                                                       | Wired-/wireless (Wi-Fi) network     |
+| VPN                | [VPN](https://www.vpn.ethz.ch/), [WebVPN](https://sslvpn.ethz.ch/) | Virtual Private Network             |
+| HPC Clusters       | [id sis hpc](https://scicomp.ethz.ch/)                             | EULER, Leonhard                     |
+
+## D-PHYS Account
+
+The **D-PHYS Account** (Physics Account) is required for the following services:
+
+| Service        | Link / Docu                                                      | Description                      |
+|----------------|------------------------------------------------------------------|----------------------------------|
+| Computer Login | [[services/workstations]], [[computing/]]                        | D-PHYS managed computers         |
+| Physics E-Mail | [[mail/]], [webmail.phys.ethz.ch](https://webmail.phys.ethz.ch/) | Mailbox: @phys.ethz.ch           |
+| File Storage   | [[storage/]]                                                     | Personal home, Group shares      |
+| Backup         | [[backups/]], [[backups/backuppc/]]                              | Managed, unmanaged computers     |
+| Web services   | [[web/]]                                                         | D-PHYS Websites (*.phys.ethz.ch) |
+| Groupware      | [[calendar/groupware/]]                                          | Calendar, address book           |
+
+
+# Physics Account
 
 All [[services|services/]] inside the Department of Physics use the same login and password, called "physics account" or "D-PHYS account".
 

network/index.markdown

@@ -27,6 +27,10 @@ If you have a visitor for only a couple of days who needs to access the wireless
 
 In case you have special devices that require wireless access, please contact us to connect them to the IoT network.
 
+VPN (Virtual Private Network)
+-----------------------------
+
+To connect to the [[ETH network|network/]] from outside the campus, please refer to [[services/how_to_use_vpn/]].
 
 Security Policy
 ---------------

network/wireless.markdown

+# Wireless
+
+todo