diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1804,6 +1804,7 @@ swh::deploy::deposit::vhost::ssl_protocol: "%{hiera('apache::ssl_protocol')}" swh::deploy::deposit::vhost::ssl_honorcipherorder: "%{hiera('apache::ssl_honorcipherorder')}" swh::deploy::deposit::vhost::ssl_cipher: "%{hiera('apache::ssl_cipher')}" +swh::deploy::deposit::vhost::access_log_format: combined_with_duration swh::deploy::deposit::locked_endpoints: - /1/private/[^/]+/[^/]+/[^/]+ - /1/private/deposits/ diff --git a/site-modules/profile/manifests/swh/deploy/deposit.pp b/site-modules/profile/manifests/swh/deploy/deposit.pp --- a/site-modules/profile/manifests/swh/deploy/deposit.pp +++ b/site-modules/profile/manifests/swh/deploy/deposit.pp @@ -37,6 +37,7 @@ $vhost_basic_auth_file = "${config_directory}/http_auth" # swh::deploy::deposit::vhost::basic_auth_content in private $vhost_basic_auth_content = lookup('swh::deploy::deposit::vhost::basic_auth_content') + $vhost_access_log_format = lookup('swh::deploy::deposit::vhost::access_log_format') $vhost_ssl_port = lookup('apache::https_port') $vhost_ssl_protocol = lookup('swh::deploy::deposit::vhost::ssl_protocol') $vhost_ssl_honorcipherorder = lookup('swh::deploy::deposit::vhost::ssl_honorcipherorder') @@ -158,6 +159,7 @@ path => "${static_dir}/robots.txt", }, ], + access_log_format => $vhost_access_log_format, require => [ File[$vhost_basic_auth_file], ]