diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1946,6 +1946,7 @@ storage: "%{alias('swh::remote_service::storage::config')}" objstorage: "%{alias('swh::remote_service::objstorage::config')}" +swh::deploy::worker::swh_indexer::mimetype::config_file: "indexer/mimetype.yml" swh::deploy::worker::swh_indexer::mimetype::concurrency: 6 swh::deploy::worker::swh_indexer::mimetype::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}" # Contains a password: in private data diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp --- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_mimetype.pp @@ -7,11 +7,12 @@ $loglevel = lookup('swh::deploy::worker::swh_indexer::mimetype::loglevel') $task_broker = lookup('swh::deploy::worker::swh_indexer::mimetype::task_broker') - $config_file = '/etc/softwareheritage/indexer/mimetype.yml' + $config_file = lookup('swh::deploy::worker::swh_indexer::mimetype::config_file') + $config_path = '${swh::conf_directory}/${config_file}' $config = lookup('swh::deploy::worker::swh_indexer::mimetype::config') $task_modules = ['swh.indexer.tasks'] - $task_queues = ['swh_indexer_content_mimetype'] + $task_queues = ['swh_indexer_content_mimetype', 'swh_indexer_content_range_mimetype'] Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_mimetype': ensure => present, @@ -27,7 +28,7 @@ ], } - file {$config_file: + file {$config_path: ensure => 'present', owner => 'swhworker', group => 'swhdev',