diff --git a/docs/ip-assignments.md b/docs/ip-assignments.md index 267632a..baa4d3b 100644 --- a/docs/ip-assignments.md +++ b/docs/ip-assignments.md @@ -2,17 +2,18 @@ ## VLANs -| ID | IPv4 | IPv6 | Name | Notes | -| ---- | ------------ | -------------- | ---------------- | ------------------------ | -| 10 | single ip | N/A | internet_backup | Provided by venue | -| 20 | 10.20.0.0/24 | N/A | mgmt | Switch/AP management | -| 21 | 10.21.0.0/22 | $NET6:21::1/64 | wired | Wired clients | -| 22 | 10.22.0.0/22 | $NET6:22::1/64 | wireless | wireless clients (on AP) | -| 23 | 10.23.0.0/24 | N/A | video | Video team | -| 24 | 10.24.0.0/24 | N/A | overflow | Overflow TVs | -| 25 | 10.25.0.0/24 | N/A | reception | Reception related | -| 26 | 10.26.0.0/24 | N/A | VoIP | Phones | -| 2222 | $PREFIX4/29 | $PREFIX6/64 | internet_primary | ? | +| ID | IPv4 | IPv6 | Name | Notes | +| --- | ------------ | -------------- | ---------------- | ------------------------ | +| 10 | single ip | N/A | internet_backup | Provided by venue | +| 20 | 10.20.0.0/24 | N/A | mgmt | Switch/AP management | +| 21 | 10.21.0.0/22 | $NET6:21::1/64 | wired | Wired clients | +| 22 | 10.22.0.0/22 | $NET6:22::1/64 | wireless | wireless clients (on AP) | +| 23 | 10.23.0.0/24 | N/A | video | Video team | +| 24 | 10.24.0.0/24 | N/A | overflow | Overflow TVs | +| 25 | 10.25.0.0/24 | N/A | reception | Reception related | +| 26 | 10.26.0.0/24 | N/A | VoIP | Phones | +| 26 | 10.27.0.0/24 | $NET6:27::1/64 | Workshop | Workshop video | +| 999 | $PREFIX4/29 | $PREFIX6/64 | internet_primary | IPAcct | ## DHCP Pools @@ -30,19 +31,29 @@ ### MGMT -| IP | Name | Notes | -| ---- | ----------- | ------------------------ | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | -| .11 | coresw | core switch | -| .15 | fl0sw | floor 0 switch | -| .21 | vocsw-A | video team switch room A | -| .22 | vocsw-B | video team switch room B | -| .25 | receptionsw | video team switch room A | -| .28 | nocsw | NOC | -| .253 | monitoring | Monitoring server | -| .254 | sonata | hypervisor management | - +| IP | Name | Notes | +| ---- | ------------ | ------------------------------- | +| .1 | gateway | router | +| .2 | dns | DNS/DHCP | +| .11 | core-sw | core switch | +| .15 | floor0-sw | floor 0 switch | +| .15 | workshop-sw | workshop switch room C | +| .21 | vocsw-A | video team switch room A | +| .22 | vocsw-B | video team switch room B | +| .25 | reception-sw | reception | +| .26 | team-sw | team | +| .28 | noc-sw | NOC | +| .50 | ap-fl | ap conf floor left foaier | +| .51 | ap-fr | ap conf floor right foaier | +| .52 | ap-voc-a1 | ap room A stage | +| .53 | ap-voc-a2 | ap room A back | +| .54 | ap-voc-b | ap room B stage | +| .55 | ap-ws-c | ap room C zone C3 | +| .56 | ap-team | ap conf floor chillout area | +| .57 | ap-ws-l | ap workshop floor workshop area | +| .58 | ap-ws-r | ap workshop floor workshop area | +| .253 | monitoring | Monitoring server | +| .254 | sonata | hypervisor management | ### Wired @@ -58,25 +69,13 @@ | .1 | gateway | router | | .2 | dns | DNS/DHCP | -### Wifi -IP | Name | Notes ---- |---------|------ -.50 | ap-fl | ap conf floor left foaier -.51 | ap-fr | ap conf floor right foaier -.52 | ap-voc-a1 | ap room A stage -.53 | ap-voc-a2 | ap room A back -.54 | ap-voc-b | ap room B stage -.55 | ap-ws-c | ap room C zone C3 -.56 | ap-team | ap conf floor chillout area -.57 | ap-ws-l | ap workshop floor workshop area -.58 | ap-ws-r | ap workshop floor workshop area - ### Video -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | +| IP | Name | Notes | +| --- | -------- | ---------- | +| .1 | gateway | router | +| .2 | dns | DNS/DHCP | +| .3 | mediamtx | Restreamer | ### Overflow diff --git a/docs/ip-assignments.md.orig b/docs/ip-assignments.md.orig deleted file mode 100644 index e6bba77..0000000 --- a/docs/ip-assignments.md.orig +++ /dev/null @@ -1,88 +0,0 @@ -# IP ranges assignments - -## VLANs - -| ID | IPv4 | IPv6 | Name | Notes | -| ---- | ------------ | -------------- | ---------------- | ------------------------ | -| 10 | single ip | N/A | internet_backup | Provided by venue | -| 20 | 10.20.0.0/24 | N/A | mgmt | Switch/AP management | -| 21 | 10.21.0.0/22 | $NET6:21::1/64 | wired | Wired clients | -| 22 | 10.22.0.0/22 | $NET6:22::1/64 | wireless | wireless clients (on AP) | -| 23 | 10.23.0.0/24 | N/A | video | Video team | -| 24 | 10.24.0.0/24 | N/A | overflow | Overflow TVs | -| 25 | 10.25.0.0/24 | N/A | reception | Reception related | -| 26 | 10.26.0.0/24 | N/A | VoIP | Phones | -| 2222 | $PREFIX4/29 | $PREFIX6/64 | internet_primary | ? | - -## DHCP Pools - -| NetworkID | Start | End | Domain Suffix | Lease Time (sec) | -| --------- | ----------- | ----------- | ---------------------- | ---------------- | -| 20 | 10.20.0.100 | 10.20.0.250 | openfest.org | 7200 | -| 21 | 10.21.0.100 | 10.21.3.250 | net.openfest.org | 600 | -| 22 | 10.22.0.100 | 10.22.3.250 | net.openfest.org | 600 | -| 23 | 10.23.0.100 | 10.23.0.250 | video.openfest.org | 7200 | -| 24 | 10.24.0.100 | 10.24.0.250 | overflow.openfest.org | 7200 | -| 25 | 10.25.0.100 | 10.25.0.250 | reception.openfest.org | 7200 | -| 26 | 10.26.0.100 | 10.26.0.250 | voice.openfest.org | 7200 | - -## Assignments (Static or reserved) - -### MGMT - -| IP | Name | Notes | -| ---- | ----------- | ------------------------ | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | -| .11 | coresw | core switch | -| .15 | fl0sw | floor 0 switch | -| .21 | vocsw-A | video team switch room A | -| .22 | vocsw-B | video team switch room B | -| .25 | receptionsw | video team switch room A | -| .28 | nocsw | NOC | -| .253 | monitoring | Monitoring server | -| .254 | sonata | hypervisor management | - - -### Wired - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | - -### Wireless - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | - -### Video - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | - -### Overflow - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | - -### Reception - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | - -### VoIP - -| IP | Name | Notes | -| --- | ------- | -------- | -| .1 | gateway | router | -| .2 | dns | DNS/DHCP | -| .3 | voip | asterisk |