diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1810,6 +1810,7 @@ - swh_lister_debian - swh_lister_github +swh::deploy::worker::swh_loader_git::config_file: "loader/git.yml" swh::deploy::worker::swh_loader_git::concurrency: 2 swh::deploy::worker::swh_loader_git::loglevel: info swh::deploy::worker::swh_loader_git::task_broker: "%{hiera('swh::deploy::worker::task_broker')}" @@ -1835,6 +1836,7 @@ scheduler: "%{alias('swh::remote_service::scheduler::config::saatchi')}" lister_db_url: "postgresql://%{hiera('swh::deploy::loader_debian::db::user')}:%{hiera('swh::deploy::loader_debian::db::password')}@%{hiera('swh::deploy::loader_debian::db::host')}:%{hiera('swh::deploy::loader_debian::db::port')}/%{hiera('swh::deploy::loader_debian::db::dbname')}" +swh::deploy::worker::swh_loader_git_disk::config_file: "loader/git-disk.yml" swh::deploy::worker::swh_loader_git_disk::concurrency: 2 swh::deploy::worker::swh_loader_git_disk::loglevel: info swh::deploy::worker::swh_loader_git_disk::task_broker: "%{hiera('swh::deploy::worker::task_broker')}" diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp --- a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git.pp @@ -6,7 +6,9 @@ $loglevel = lookup('swh::deploy::worker::swh_loader_git::loglevel') $task_broker = lookup('swh::deploy::worker::swh_loader_git::task_broker') - $config_file = '/etc/softwareheritage/loader/git-updater.yml' + $config_file = lookup('swh::deploy::worker::swh_loader_git::config_file') + $config_directory = lookup('swh::conf_directory') + $config_path = "${config_directory}/${config_file}" $config = lookup('swh::deploy::worker::swh_loader_git::config') $task_modules = ['swh.loader.git.tasks'] @@ -21,11 +23,11 @@ task_queues => $task_queues, require => [ Class['profile::swh::deploy::base_loader_git'], - File[$config_file], + File[$config_path], ], } - file {$config_file: + file {$config_path: ensure => 'present', owner => 'swhworker', group => 'swhworker', diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git_disk.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git_disk.pp --- a/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git_disk.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/swh_loader_git_disk.pp @@ -6,7 +6,9 @@ $loglevel = lookup('swh::deploy::worker::swh_loader_git_disk::loglevel') $task_broker = lookup('swh::deploy::worker::swh_loader_git_disk::task_broker') - $config_file = '/etc/softwareheritage/loader/git-loader.yml' + $config_file = lookup('swh::deploy::worker::swh_loader_git_disk::config_file') + $config_directory = lookup('swh::conf_directory') + $config_path = "${config_directory}/${config_file}" $config = lookup('swh::deploy::worker::swh_loader_git_disk::config') $task_modules = ['swh.loader.git.tasks'] @@ -25,11 +27,11 @@ task_queues => $task_queues, require => [ Class['profile::swh::deploy::base_loader_git'], - File[$config_file], + File[$config_path], ], } - file {$config_file: + file {$config_path: ensure => 'present', owner => 'swhworker', group => 'swhworker',