Reorganize network stuff

config/network/brocade-icx.md → config/network/brocade-fastiron-switches.md

@@ -1,11 +1,13 @@
 ---
-title: Brocade ICX Switches
+title: Brocade FastIron Switches
 breadcrumbs:
 - title: Configuration
 - title: Network
 ---
 {% include header.md %}
 
+**TODO:** Reorganize.
+
 ### Using
 {:.no_toc}
 

config/network/cisco-asr.md → config/network/cisco-hardware.md

@@ -1,24 +1,25 @@
 ---
-title: Cisco ASR Series
+title: Cisco Hardware
 breadcrumbs:
 - title: Configuration
 - title: Network
 ---
 {% include header.md %}
 
-Hardware and special configuration for Cisco ASRs (aggregation services routers).
+Hardware and special configuration for Cisco equipment.
 
 ### Related Pages
 {:.no_toc}
 
 - [Cisco IOS General](../cisco-ios-general/)
 - [Cisco IOS Routers](../cisco-ios-routers/)
+- [Cisco IOS Switches](../cisco-ios-switches/)
 
-## General
+## ASR General
 
 - The ASR series runs IOS-XE, a more modern and less monolithic version of IOS running on top of Linux. The commands and configurations are mostly the same, but with some significant changes.
 
-## Cisco ASR 920
+## ASR 920
 
 ### Safe Shutdown
 

config/network/cisco-ios-general.md

@@ -11,6 +11,7 @@ Software configuration for Cisco switches and routers running IOS or derivatives
 ### Related Pages
 {:.no_toc}
 
+- [Cisco Hardware](../cisco-hardware/)
 - [Cisco IOS Routers](../cisco-ios-routers/)
 - [Cisco IOS Switches](../cisco-ios-switches/)
 

config/network/cisco-ios-routers.md

@@ -11,6 +11,7 @@ Software configuration for Cisco routers running IOS or derivatives.
 ### Related Pages
 {:.no_toc}
 
+- [Cisco Hardware](../cisco-hardware/)
 - [Cisco IOS General](../cisco-ios-general/)
 - [Cisco IOS Switches](../cisco-ios-switches/)
 

config/network/cisco-ios-switches.md

@@ -11,6 +11,7 @@ Software configuration for Cisco switches running IOS or derivatives.
 ### Related Pages
 {:.no_toc}
 
+- [Cisco Hardware](../cisco-hardware/)
 - [Cisco IOS General](../cisco-ios-general/)
 - [Cisco IOS Routers](../cisco-ios-routers/)
 

config/network/juniper-hardware.md

@@ -0,0 +1,15 @@
+---
+title: Juniper Hardware
+breadcrumbs:
+- title: Configuration
+- title: Network
+---
+{% include header.md %}
+
+### Related Pages
+{:.no_toc}
+
+- [Juniper Junos General](../juniper-junos-general/)
+- [Juniper Junos Switches](../juniper-junos-switches/)
+
+{% include footer.md %}

config/network/juniper-general.md → config/network/juniper-junos-general.md

@@ -1,17 +1,18 @@
 ---
-title: Juniper General
+title: Juniper Junos General
 breadcrumbs:
 - title: Configuration
 - title: Network
 ---
 {% include header.md %}
 
-**TODO** Reorganize and add missing basic stuff.
+**TODO** Clean up and add remaining stuff.
 
 ### Related Pages
 {:.no_toc}
 
-- [Juniper EX Series Switches](../juniper-ex/)
+- [Juniper Hardware](../juniper-hardware/)
+- [Juniper Junos Switches](../juniper-junos-switches/)
 
 ### Disclaimer
 {:.no_toc}

config/network/juniper-ex.md → config/network/juniper-junos-switches.md

@@ -6,10 +6,13 @@ breadcrumbs:
 ---
 {% include header.md %}
 
+**TODO** Clean up and add remaining stuff.
+
 ### Related Pages
 {:.no_toc}
 
-- [Juniper Junos OS](../juniper-junos/)
+- [Juniper Hardware](../juniper-hardware/)
+- [Juniper Junos General](../juniper-junos-general/)
 
 ### Using
 {:.no_toc}

config/network/unifi.md → config/network/ubiquiti-unifi-aps.md

@@ -1,23 +1,23 @@
 ---
-title: Ubiquiti UniFi
+title: Ubiquiti UniFi Access Points
 breadcrumbs:
 - title: Configuration
 - title: Network
 ---
 {% include header.md %}
 
+### Related Pages
+{:.no_toc}
+
+- [Ubiquiti UniFi Controllers](../ubiquiti-unifi-controllers/)
+
 ### Using
 {:.no_toc}
 
-- Controller v5 on Debian 9 (Stretch)
 - AP AC Lite
 - AP AC LR
 
-## Controller
-
-For setting up the controller on a Debian server, see [Ubiquiti UniFi Controller (Debian)](../../linux-server/unifi/).
-
-## Access Points
+## General
 
 - PoE info: [UniFi: Supported PoE Protocols](https://help.ubnt.com/hc/en-us/articles/115000263008--UniFi-Understanding-PoE-and-How-UniFi-Devices-are-Powered)
 - Adoption methods: [UniFi: Device Adoption Methods for Remote UniFi Controllers](https://help.ubnt.com/hc/en-us/articles/204909754-UniFi-Device-Adoption-Methods-for-Remote-UniFi-Controllers)
@@ -29,7 +29,7 @@ For setting up the controller on a Debian server, see [Ubiquiti UniFi Controller
     - "Guest Policy": For client isolation and captive portal. Does not support IPv6. May cause communication to fail after connecting to the AP.
     - "High Performance Devices": May cause the connection establishment to to fail.
 
-### Wireless Uplink (Meshing)
+## Wireless Uplink (Meshing)
 
 - Old firmware versions can be buggy wrt. wireless uplinks and can cause L2 loops.
 - The APs can be adopted wirelessly if one of them is connected to the network.

config/server/unifi.md → config/network/ubiquiti-unifi-controllers.md

@@ -1,26 +1,32 @@
 ---
-title: Ubiquiti UniFi Controller
+title: Ubiquiti UniFi Controllers
 breadcrumbs:
 - title: Configuration
 - title: Server
 ---
 {% include header.md %}
 
-### Using
+### Related Pages
 {:.no_toc}
 
-- Controller v5 on Debian 9 (Stretch)
-- AP AC Lite
-- AP AC LR
+- [Ubiquiti UniFi Access Points](../ubiquiti-unifi-aps/)
 
-## Installation on Debian 9
+## Cloud Key
+
+- A standalone device by Ubiquiti.
+- Costs money.
+- Requires physical space and power.
+- Doen't require setting it up yourself, which can be a little tricky/uncomfortable.
+- Supports a limited amount of devices and clients, however most small-to-mid-size deployments are unlikely to reach that limit.
+
+## Debian
 
 UniFi 5 is the latest version and does only officially support Debian 9 (Stretch) and Ubuntu Desktop/Server 16.04 for Linux. It requires Java 8 and other stuff which is an absolute pain to install on later versions of Debian. There is also the official physical Cloud Key device and multiple unofficial Docker images and installation packages for Linux servers.
 
 Official installation instructions: [UniFi: How to Install & Upgrade the UniFi Network Controller Software](https://help.ubnt.com/hc/en-us/articles/360012282453-UniFi-How-to-Install-Upgrade-the-UniFi-Network-Controller-Software)
 
-1. Install Debian 9 (yes, 9).
-1. Configure it: See [Debian Server](../debian/) (for Debian 10).
+1. Install Debian 9 (later versions don't have the required versions of Java etc.).
+1. Configure it: See [Debian Server](../server/../debian/) (for Debian 10).
 1. Allow the following incoming ports (see [UniFi - Ports Used](https://help.ubnt.com/hc/en-us/articles/218506997-UniFi-Ports-Used)):
     - TCP 8080: Device-controller communication (for devices)
     - TCP 8443: GUI/API (for admins)

index.md

@@ -21,7 +21,6 @@ Random collection of config notes and miscellaneous theory. Technically not a wi
 - [Linux Server Storage](config/server/linux-storage/)
 - [Linux Server Applications](config/server/linux-applications/)
 - [Proxmox VE](config/server/proxmox-ve/)
-- [Ubiquiti UniFi Controller](config/server/unifi/)
 - [Home Assistant](config/server/home-assistant/)
 - [Dell PowerEdge](config/server/dell-poweredge/)
 - [HP ProLiant](config/server/hp-proliant/)
@@ -49,17 +48,19 @@ Random collection of config notes and miscellaneous theory. Technically not a wi
 
 #### Specific
 
-- [Brocade ICX Switches](config/network/brocade-icx/)
-- [Cisco ASR](config/network/cisco-ios-general/)
+- [Brocade FastIron Switches](config/network/brocade-fastiron-switches/)
+- [Cisco Hardware](config/network/cisco-hardware/)
 - [Cisco IOS General](config/network/cisco-ios-general/)
 - [Cisco IOS Routers](config/network/cisco-ios-routers/)
 - [Cisco IOS Switches](config/network/cisco-ios-switches/)
-- [Juniper General](config/network/juniper-general/)
-- [Juniper EX Series Switches](config/network/juniper-ex/)
+- [Juniper Hardware](config/network/juniper-general/)
+- [Juniper Junos General](config/network/juniper-junos-general/)
+- [Juniper Junos Switches](config/network/juniper-junos-switches/)
 - [Linksys LGS Switches](config/network/linksys-lgs/)
 - [Linux Switching & Routing](config/network/linux/)
 - [pfSense](config/network/pfsense/)
-- [Uniquiti UniFi](config/network/unifi/)
+- [Ubiquiti UniFi Controllers](config/network/ubiquiti-unifi-controllers/)
+- [Uniquiti UniFi Access Points](config/network/ubiquiti-unifi-aps/)
 
 ### Game Servers