diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml index 4e42e3fc..dfa4a99b 100644 --- a/data/deployments/production/common.yaml +++ b/data/deployments/production/common.yaml @@ -1,24 +1,25 @@ swh::deploy::deposit::reverse_proxy::backend_http_host: "::1" swh::deploy::webapp::reverse_proxy::backend_http_host: "::1" elasticsearch::config::cluster::name: swh-logging-prod elasticsearch::config::discovery::seed_hosts: - esnode1.internal.softwareheritage.org - esnode2.internal.softwareheritage.org - esnode3.internal.softwareheritage.org elasticsearch::config::cluster::initial_master_nodes: - esnode1 - esnode2 - esnode3 elasticsearch::jvm_options::heap_size: 16g swh::postgresql::shared_buffers: 4GB swh::deploy::webapp::url: "https://archive.softwareheritage.org" # e2e checks on vault swh::deploy::vault::e2e::storage: "http://saam.internal.softwareheritage.org:%{hiera('swh::remote_service::storage::port')}" - swh::deploy::worker::loader_git::concurrency: 4 + +memcached::server::max_memory: 1224 diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml index 3a024696..6ec5710b 100644 --- a/data/hostname/moma.softwareheritage.org.yaml +++ b/data/hostname/moma.softwareheritage.org.yaml @@ -1,60 +1,61 @@ networks: eth0: address: 128.93.166.15 netmask: 26 gateway: 128.93.166.62 eth1: type: private address: 192.168.100.31 netmask: 255.255.255.0 gateway: 192.168.100.1 backups::exclude: - var/lib/rabbitmq swh::deploy::search::backend::listen::host: moma.internal.softwareheritage.org swh::deploy::storage::backend::listen::host: moma.internal.softwareheritage.org swh::deploy::storage::db::host: somerset.internal.softwareheritage.org swh::deploy::storage::backend::workers: 16 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: cls: multiplexer args: objstorages: - "%{alias('swh::remote_service::objstorage::config::banco::readonly')}" - "%{alias('swh::remote_service::objstorage::config::saam::readonly')}" hitch::frontend: "[*]:443" hitch::proxy_support: true varnish::http_port: 80 apache::http_port: 9080 # Disabled as it seems to be flaky #hitch::http2_support: true #varnish::http2_support: true # Disable default vhost on port 80 apache::default_vhost: false swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}" +