diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -124,10 +124,20 @@ network: 192.168.128.0/24 gateway: "%{alias('networks::staging_gateway')}" enabled: false - + staging_new: + network: 192.168.130.0/24 + gateway: "%{alias('networks::staging_new_gateway')}" + enabled: false + admin: + network: 192.168.50.0/24 + gateway: "%{alias('networks::admin_gateway')}" + enabled: false + networks::private_network: 192.168.100.0/24 networks::private_gateway: 192.168.100.1 networks::staging_gateway: 192.168.100.125 +networks::staging_new_gateway: 192.168.100.130 +networks::admin_gateway: 192.168.100.130 locales::default_locale: C.UTF-8 locales::installed_locales: @@ -931,6 +941,12 @@ staging-gateway/A: # Cannot autogenerate due to limitations in $::swh_hostname fact record: staging-gateway.internal.softwareheritage.org data: 192.168.100.125 + pushkin/A: # OPNSense firewall, not managed by puppet + record: pushkin.internal.softwareheritage.org + data: 192.168.100.129 + pushkin/A: # Firewal(s)l vip, not managed by puppet + record: gw.internal.softwareheritage.org + data: 192.168.100.130 # Non-puppet azure hosts pgmirror0.euwest.azure/A: record: pgmirror0.euwest.azure.internal.softwareheritage.org diff --git a/data/hostname/pergamon.softwareheritage.org.yaml b/data/hostname/pergamon.softwareheritage.org.yaml --- a/data/hostname/pergamon.softwareheritage.org.yaml +++ b/data/hostname/pergamon.softwareheritage.org.yaml @@ -28,6 +28,10 @@ networks::private_routes: staging: enabled: true + staging_new: + enabled: true + admin: + enabled: true # Set apache MPM to prefork