diff --git a/data/hostname/webapp0.softwareheritage.org.yaml b/data/hostname/webapp0.softwareheritage.org.yaml index 135df83d..16c0aa97 100644 --- a/data/hostname/webapp0.softwareheritage.org.yaml +++ b/data/hostname/webapp0.softwareheritage.org.yaml @@ -1,13 +1,11 @@ -networks: [] - swh::deploy::storage::db::host: somerset swh::deploy::storage::db::port: 5433 hitch::frontend: "[*]:443" hitch::proxy_support: true varnish::http_port: 80 apache::http_port: 9080 # Disable default vhost on port 80 apache::default_vhost: false diff --git a/manifests/site.pp b/manifests/site.pp index 3d4de6e2..dfe48df4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,87 +1,91 @@ node 'louvre.softwareheritage.org' { include role::swh_hypervisor_master } node 'beaubourg.softwareheritage.org', 'orsay.softwareheritage.org' { include role::swh_hypervisor } node 'pergamon.softwareheritage.org' { include role::swh_sysadmin } node 'tate.softwareheritage.org' { include role::swh_forge } -node /^(moma|webapp0).softwareheritage.org$/ { +node 'moma.softwareheritage.org' { include role::swh_api } +node 'webapp0.softwareheritage.org' { + include role::swh_api_azure +} + node 'saatchi.internal.softwareheritage.org' { include role::swh_scheduler } node /^(prado|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database } node 'banco.softwareheritage.org' { include role::swh_backup } node /^(unibo-test|orangeriedev).(internal.)?softwareheritage.org$/ { include role::swh_vault_test } node /^(unibo-prod|orangerie).(internal.)?softwareheritage.org$/ { include role::swh_vault } node /^(uffizi|storage\d+\.[^.]+\.azure).(internal.)?softwareheritage.org$/ { include role::swh_storage } node /^getty.(internal.)?softwareheritage.org$/ { include role::swh_eventlog } node 'worker08.softwareheritage.org' { include role::swh_worker_inria_miracle } node /^worker\d+\.(internal\.)?softwareheritage\.org$/ { include role::swh_worker_inria } node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ { include role::swh_worker_azure } node 'dbreplica0.euwest.azure.internal.softwareheritage.org' { include role::swh_database } node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_osd } node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_mon } node 'thyssen.internal.softwareheritage.org' { include role::swh_ci_server } node 'giverny.softwareheritage.org', 'petit-palais.softwareheritage.org', 'grand-palais.softwareheritage.org'{ include role::swh_desktop } node default { include role::swh_server include profile::puppet::agent }