promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Showing only changes of commit dca99d2716 - Show all commits

View File

@ -16,10 +16,10 @@ profiles::dhcp::server::pools:
- '198.18.15.200 198.18.15.220' - '198.18.15.200 198.18.15.220'
gateway: 198.18.15.254 gateway: 198.18.15.254
nameservers: nameservers:
- 198.18.17.7 - 198.18.13.12
- 198.18.17.8 - 198.18.13.13
domain_name: main.unkin.net domain_name: main.unkin.net
pxeserver: 198.18.17.48 pxeserver: 198.18.13.27
syd1-test: syd1-test:
network: 198.18.16.0 network: 198.18.16.0
mask: 255.255.255.0 mask: 255.255.255.0
@ -27,10 +27,10 @@ profiles::dhcp::server::pools:
- '198.18.16.200 198.18.16.220' - '198.18.16.200 198.18.16.220'
gateway: 198.18.16.254 gateway: 198.18.16.254
nameservers: nameservers:
- 198.18.17.7 - 198.18.13.12
- 198.18.17.8 - 198.18.13.13
domain_name: main.unkin.net domain_name: main.unkin.net
pxeserver: 198.18.17.48 pxeserver: 198.18.13.27
syd1-prod1: syd1-prod1:
network: 198.18.13.0 network: 198.18.13.0
mask: 255.255.255.0 mask: 255.255.255.0
@ -38,10 +38,10 @@ profiles::dhcp::server::pools:
- '198.18.13.200 198.18.13.220' - '198.18.13.200 198.18.13.220'
gateway: 198.18.13.254 gateway: 198.18.13.254
nameservers: nameservers:
- 198.18.17.7 - 198.18.13.12
- 198.18.17.8 - 198.18.13.13
domain_name: main.unkin.net domain_name: main.unkin.net
pxeserver: 198.18.17.48 pxeserver: 198.18.13.27
syd1-prod2: syd1-prod2:
network: 198.18.14.0 network: 198.18.14.0
mask: 255.255.255.0 mask: 255.255.255.0
@ -49,10 +49,10 @@ profiles::dhcp::server::pools:
- '198.18.14.200 198.18.14.220' - '198.18.14.200 198.18.14.220'
gateway: 198.18.14.254 gateway: 198.18.14.254
nameservers: nameservers:
- 198.18.17.7 - 198.18.13.12
- 198.18.17.8 - 198.18.13.13
domain_name: main.unkin.net domain_name: main.unkin.net
pxeserver: 198.18.17.48 pxeserver: 198.18.13.27
drw1-prod: drw1-prod:
network: 198.18.17.0 network: 198.18.17.0
mask: 255.255.255.0 mask: 255.255.255.0
@ -63,7 +63,7 @@ profiles::dhcp::server::pools:
- 198.18.17.7 - 198.18.17.7
- 198.18.17.8 - 198.18.17.8
domain_name: main.unkin.net domain_name: main.unkin.net
pxeserver: 198.18.17.48 pxeserver: 198.18.13.27
# UFI 64-bit # UFI 64-bit
profiles::dhcp::server::classes: profiles::dhcp::server::classes: