diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -971,6 +971,9 @@ maven-exporter.internal.staging.swh.network: domains: - maven-exporter.internal.staging.swh.network + maven-exporter.internal.softwareheritage.org: + domains: + - maven-exporter.internal.softwareheritage.org pergamon.softwareheritage.org: domains: - pergamon.softwareheritage.org @@ -3931,6 +3934,7 @@ azure_billing::vhost::ssl_cipher: "%{hiera('apache::ssl_cipher')}" azure_billing::vhost::hsts_header: "%{hiera('apache::hsts_header')}" +swh::deploy::maven_index_exporter::url: maven-exporter.internal.softwareheritage.org maven_index_exporter::vhost::name: "%{lookup('swh::deploy::maven_index_exporter::url')}" maven_index_exporter::vhost::ssl_protocol: "%{hiera('apache::ssl_protocol')}" maven_index_exporter::vhost::ssl_honorcipherorder: "%{hiera('apache::ssl_honorcipherorder')}" diff --git a/data/hostname/maven-exporter.internal.softwareheritage.org b/data/hostname/maven-exporter.internal.softwareheritage.org new file mode 100644 --- /dev/null +++ b/data/hostname/maven-exporter.internal.softwareheritage.org @@ -0,0 +1,4 @@ +swh::apt_config::enable_non_free: true +packages: + # install zfs + - zfs-dkms diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -97,6 +97,10 @@ - inventory.internal.softwareheritage.org 10.168.50.90: host: thanos.internal.admin.swh.network + 10.168.100.10: + host: maven-exporter.internal.softwareheritage.org + aliases: + - maven-exporter.internal.softwareheritage.org 10.168.100.18: host: banco.internal.softwareheritage.org aliases: diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -232,6 +232,10 @@ include role::swh_maven_index_exporter } +node 'maven-exporter.internal.softwareheritage.org' { + include role::swh_maven_index_exporter +} + node /^argo-worker\d+\.internal\.admin\.swh\.network$/ { include role::rancher_node }