1 files changed, 52 insertions, 33 deletions

diff --git a/notes/projects/strongswan/vpn-notes.md b/notes/projects/strongswan/vpn-notes.md
index d380ddf..506775c 100644
--- a/notes/projects/strongswan/vpn-notes.md
+++ b/notes/projects/strongswan/vpn-notes.md
@@ -102,19 +102,30 @@ Networking
 ==========
 
    * VLAN
-     - VPN Internal:   ISP_VPN  / 2080
-     - VPN Public:     ISP_VPN  / 2081
+     - VPN Internal:          ISP_VPN  / 2080
+     - VPN Public:            ISP_VPN  / 2081
 
    * Networks
-     - 10.0.49.192/27       ISP VPN/Strongswan Servers Private
-       - 10.0.49.192/28     ISP VPN/Strongswan Servers Private (NWC)
-       - 10.0.49.208/28     ISP VPN/Strongswan Servers Private (CWC)
-     - 10.0.59.0/24         ISP VPN/Strongswan Pools
-       - 10.0.59.0/25       ISP VPN/Strongswan Pool (NWC)
-       - 10.0.59.128/25     ISP VPN/Strongswan Pool (CWC)
-     - 209.112.142.48/28    ISP VPN/Strongswan Servers Public
-       - 209.112.142.48/29  ISP VPN/Strongswan Servers Public (NWC)
-       - 209.112.142.56/29  ISP VPN/Strongswan Servers Public (CWC)
+     - 10.0.10.0/24           ISP VPN Admin Pools
+       - 10.0.10.0/25         ISP Cisco VPN3000 Pool
+       - 10.0.10.128/26       ISP VPN/Strongswan Admin Pool (NWC)
+       - 10.0.10.192/26       ISP VPN/Strongswan Admin Pool (CWC)
+
+     - 10.0.49.192/27         ISP VPN/Strongswan Servers Private
+       - 10.0.49.192/28       ISP VPN/Strongswan Servers Private (NWC)
+       - 10.0.49.208/28       ISP VPN/Strongswan Servers Private (CWC)
+
+     - 10.0.59.128/25         ISP VPN/Strongswan User Pools
+       - 10.0.59.128/26       ISP VPN/Strongswan User Pool (NWC)
+       - 10.0.59.192/26       ISP VPN/Strongswan User Pool (CWC)
+
+     - 209.112.142.48/28      ISP VPN/Strongswan Servers Public
+       - 209.112.142.48/29    ISP VPN/Strongswan Servers Public (NWC)
+       - 209.112.142.56/29    ISP VPN/Strongswan Servers Public (CWC)
+
+     - 209.112.156.200/30     ISP VPN/Strongswan Admin NAT
+       - 209.112.156.200/31   ISP VPN/Strongswan Admin NAT (NWC)
+       - 209.112.156.202/31   ISP VPN/Strongswan Admin NAT (CWC)
 
 
 Hosts
@@ -129,6 +140,10 @@ Virtual Addresses
      - 209.112.142.12  - vpn.acsalaska.net
 
    * User NAT IP Addresses
+     - 209.112.142.52  - usrnat1.vpnvrrp20.nwc.acsalaska.net.
+     - 209.112.142.53  - usrnat1.vpnvrrp20.nwc.acsalaska.net.
+     - 209.112.142.60  - usrnat1.vpnvrrp30.cwc.acsalaska.net.
+     - 209.112.142.61  - usrnat1.vpnvrrp30.cwc.acsalaska.net.
 
    * Admin NAT IP Addresses
      - 209.112.156.200 - admnat1.vpnvrrp20.nwc.acsalaska.net
@@ -149,18 +164,8 @@ Routers
      - xe-11/3/1.2081: 209.112.142.62/29
 
 
-Servers (NWC)
--------------
-
-   * vpn20.prv.nwc
-     - Alias:      vpn20.mwc.acsalaska.net
-     - Parent:     TBD
-     - Network:    VLAN 2080: 10.0.49.193/28     GW 10.0.49.206
-     
-   * vpn21.prv.nwc
-     - Alias:      vpn21.nwc.acsalaska.net
-     - Parent:     TBD
-     - Network:    VLAN 2080: 10.0.49.194/28     GW 10.0.49.206
+VRRP Groups
+-----------
 
    * vpnvrrp20.prv.nwc
      - Parent:     vpn20.prv.nwc/vpn21.prv.nwc
@@ -169,10 +174,32 @@ Servers (NWC)
    * vpnvrrp20.nwc
      - Parent:     vpn20.prv.nwc/vpn21.prv.nwc
      - Network:    VLAN 2081: 209.112.142.49/29  GW 209.112.142.55
+                   VLAN 2081: 209.112.142.52/29
+                   VLAN 2081: 209.112.142.53/29
 
+   * vpnvrrp30.prv.cwc
+     - Parent:     vpn30.prv.cwc/vpn31.prv.cwc
+     - Network:    VLAN 2080: 10.0.49.213/28     GW 10.0.49.222
+
+   * vpnvrrp30.cwc
+     - Parent:     vpn30.prv.cwc/vpn31.prv.cwc
+     - Network:    VLAN 2081: 209.112.142.58/29  GW 209.112.142.62
+                   VLAN 2081: 209.112.142.60/29
+                   VLAN 2081: 209.112.142.61/29
 
-Servers (CWC)
--------------
+
+Servers
+-------
+
+   * vpn20.prv.nwc
+     - Alias:      vpn20.mwc.acsalaska.net
+     - Parent:     xen62.prv.nwc/xen63.prv.nwc
+     - Network:    VLAN 2080: 10.0.49.193/28     GW 10.0.49.206
+     
+   * vpn21.prv.nwc
+     - Alias:      vpn21.nwc.acsalaska.net
+     - Parent:     xen63.prv.nwc/xen62.prv.nwc
+     - Network:    VLAN 2080: 10.0.49.194/28     GW 10.0.49.206
 
    * vpn30.prv.cwc
      - Alias:      vpn30.cwc.acsalaska.net
@@ -184,12 +211,4 @@ Servers (CWC)
      - Parent:     xen19.prv.cwc/xen18.prv.cwc
      - Network:    VLAN 2080: 10.0.49.210/28     GW 10.0.49.222
 
-   * vpnvrrp30.prv.cwc
-     - Parent:     vpn30.prv.cwc/vpn31.prv.cwc
-     - Network:    VLAN 2080: 10.0.49.213/28     GW 10.0.49.222
-
-   * vpnvrrp30.cwc
-     - Parent:     vpn30.prv.cwc/vpn31.prv.cwc
-     - Network:    VLAN 2081: 209.112.142.58/29  GW 209.112.142.62
-