diff --git a/data/hostname/pergamon.softwareheritage.org.yaml b/data/hostname/pergamon.softwareheritage.org.yaml index 650fb37f..ec51378d 100644 --- a/data/hostname/pergamon.softwareheritage.org.yaml +++ b/data/hostname/pergamon.softwareheritage.org.yaml @@ -1,79 +1,82 @@ dns::local_cache: false # Overrides for primary bind server bind::zones::type: master +dns::forwarders: + - 193.51.196.130 + - 193.51.196.131 smtp::relay_destinations: - destination: "%{hiera('phabricator::vhost::name')}" route: smtp:[tate.internal.softwareheritage.org] smtp::mynetworks: - 127.0.0.0/8 - "[::ffff:127.0.0.0]/104" - "[::1]/128" - 192.168.100.0/23 - 192.168.200.0/21 networks: eth0: address: 128.93.193.29 netmask: 255.255.255.0 gateway: 128.93.193.254 eth1: type: private address: 192.168.100.29 netmask: 255.255.255.0 gateway: 192.168.100.1 networks::private_routes: staging_legacy: enabled: true staging: enabled: true admin: enabled: true public_swh_network: enabled: true # Set apache MPM to prefork apache::mpm_module: prefork backups::exclude: - srv/softwareheritage/annex/annexroot - srv/softwareheritage/bitbucket-archive - var/lib/prometheus icinga2::role: master icinga2::features: - checker - mainlog - notification - statusdata - compatlog - command systemd_journal::role: collector users: jenkins-push-docs: uid: 3000 full_name: Jenkins Documentation Push user shell: /bin/bash authorized_keys: jenkins-push-docs@thyssen: type: ssh-rsa key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDWk4WLCNPdSthCdYSDGP7UEIzrBigy2q74ux6OjxSd7SxUKObbsVJeV1MLxIrK3DALQEGZuNUn8hPH6NnyuRBoY+5b7KJ1uV4UAZc4CctxLrrq81cS4x71wU6bzNlZH8DFZa5s0WFnskzg1X5KvyNDj/EdJ8a1TbL/wtj8dPw9odcCw82uqT9Dookvn+yAJ6Lld4MJYy03TfQGCufq2aRRbe/wwNTgL01g3FOuOpaXgmNGGyPpUae290M3+2/slqnHmTDTabnAwDFGfgdX3EIZ2janNJN1j9/5sqDmRQt/cpc5GXfZkpuEIm6+PBj2EWPpHuOUOCAJOQ8u/x2m+v1JJ7qtEmp4sKGqRddUROsWJD73z6XA/p3Xd+nfSrxgnFpW/38upttkqh1OVZshv0+8RijK9Ve5NTU2tIQXmFyYniHUJ8CYpDJug/0pOWNy8Jasqk8jt2Qm5mwR4q9v47PR413KAv+mr/VrhECJKbfoExf3djNYekXtYwD/L45dKg2ogFiZOHgzJSqtoUlIy6RY6ylo1/u3PZY+g3HpcDUYCjNigO8Wwc4ACYIS+DvPRYm0/6+rGl/GoHcgWV4sFKXZCkcGPikL/ECIB6i5AFBKArEYtijN86lhw+dKDEEjQHrURqGMkX2v2TQ37KRSVDY7YoC7Bn+aKWKPGvlR0l9nuw== boatbucket: uid: 1002 full_name: Bitbucket Life Raft shell: /bin/bash groups: jenkins-push-docs: gid: 3000 boatbucket: gid: 1024 diff --git a/data/subnets/sesi_rocquencourt.yaml b/data/subnets/sesi_rocquencourt.yaml index 149deaa7..f275fe29 100644 --- a/data/subnets/sesi_rocquencourt.yaml +++ b/data/subnets/sesi_rocquencourt.yaml @@ -1,31 +1,31 @@ --- dns::local_nameservers: - 192.168.100.29 - 192.168.200.22 dns::forwarders: - - 193.51.196.130 - - 193.51.196.131 + - 192.168.100.29 + - 192.168.200.22 dns::forwarder_insecure: true ntp::servers: - sesi-ntp1.inria.fr - sesi-ntp2.inria.fr internal_network: 192.168.100.0/24 smtp::relay_hostname: 'smtp.inria.fr' swh::deploy::worker::instances: - checker_deposit - lister - loader_archive - loader_cran - loader_debian - loader_deposit - loader_git - loader_mercurial - loader_nixguix - loader_npm - loader_pypi - loader_svn