diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -754,6 +754,7 @@ swh::deploy::reverse_proxy::services: - deposit - webapp + - objstorage letsencrypt::account_email: sysop+letsencrypt@softwareheritage.org letsencrypt::server: https://acme-v02.api.letsencrypt.org/directory @@ -805,6 +806,10 @@ domains: - broker0.journal.staging.swh.network - journal0.internal.staging.swh.network + objstorage_production: + domains: + - objstorage.softwareheritage.org + - objstorage.internal.softwareheritage.org objstorage_staging: domains: - objstorage.staging.swh.network @@ -1881,6 +1886,7 @@ - 127.0.0.1 - localhost - "::1" +swh::deploy::objstorage::reverse_proxy::backend_http_port: "%{lookup('swh::remote_service::objstorage::port')}" swh::deploy::deposit::reverse_proxy::backend_http_port: "%{alias('varnish::backend_http_port')}" diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml --- a/data/deployments/staging/common.yaml +++ b/data/deployments/staging/common.yaml @@ -143,7 +143,6 @@ swh::deploy::objstorage::vhost::letsencrypt_cert: objstorage_staging swh::deploy::objstorage::reverse_proxy::backend_http_host: objstorage0.internal.staging.swh.network -swh::deploy::objstorage::reverse_proxy::backend_http_port: "%{lookup('swh::remote_service::objstorage::port')}" swh::deploy::objstorage::backend::public_server_name: objstorage.staging.swh.network diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml --- a/data/hostname/moma.softwareheritage.org.yaml +++ b/data/hostname/moma.softwareheritage.org.yaml @@ -19,6 +19,25 @@ swh::deploy::storage::db::user: guest swh::deploy::storage::db::password: guest +swh::deploy::objstorage::backend::listen::host: moma.internal.softwareheritage.org +swh::deploy::objstorage::vhost::letsencrypt_cert: objstorage_production +swh::deploy::objstorage::reverse_proxy::backend_http_host: "%{alias('swh::deploy::objstorage::backend::listen::host')}" + +swh::deploy::objstorage::backend::public_server_name: + objstorage.softwarehritage.org + objstorage.internal.softwareheritage.org + +swh::deploy::objstorage::backend::server_names: + - "%{alias('swh::deploy::objstorage::backend::public_server_name')}" + - "%{::swh_hostname.internal_fqdn}" + - "%{::hostname}" + - 127.0.0.1 + - localhost + - "::1" + +swh::deploy::objstorage::config: + objstorage: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}" + hitch::frontend: "[*]:443" hitch::proxy_support: true diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -101,6 +101,8 @@ aliases: - archive.internal.softwareheritage.org - deposit.internal.softwareheritage.org + - objstorage.softwareheritage.org + - objstorage.internal.softwareheritage.org 10.168.100.32: host: beaubourg.internal.softwareheritage.org 10.168.100.34: diff --git a/site-modules/role/manifests/swh_rp_webapps.pp b/site-modules/role/manifests/swh_rp_webapps.pp --- a/site-modules/role/manifests/swh_rp_webapps.pp +++ b/site-modules/role/manifests/swh_rp_webapps.pp @@ -5,4 +5,6 @@ # - deposit class role::swh_rp_webapps inherits role::swh_rp_webapp { include profile::swh::deploy::deposit + include profile::swh::deploy::objstorage_cloud + include profile::swh::deploy::objstorage }