diff --git a/site-modules/profile/manifests/swh/deploy/archiver.pp b/site-modules/profile/manifests/swh/deploy/archiver.pp index ff2a715a..a8ed46b6 100644 --- a/site-modules/profile/manifests/swh/deploy/archiver.pp +++ b/site-modules/profile/manifests/swh/deploy/archiver.pp @@ -1,21 +1,12 @@ # Archiver base configuration class profile::swh::deploy::archiver { include ::profile::swh::deploy::objstorage_cloud - $config_dir = lookup('swh::deploy::worker::swh_storage_archiver::conf_directory') - - file {$config_dir: - ensure => 'directory', - owner => 'swhworker', - group => 'swhworker', - mode => '0644', - } - $packages = ['python3-swh.archiver'] package {$packages: ensure => 'installed', } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp b/site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp index 57f9b2ec..caba68d3 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/storage_archiver.pp @@ -1,30 +1,30 @@ # Deployment for swh-storage-archiver class profile::swh::deploy::worker::storage_archiver { include ::profile::swh::deploy::archiver $concurrency = lookup('swh::deploy::worker::storage_archiver::concurrency') $max_tasks_per_child = lookup('swh::deploy::worker::storage_archiver::max_tasks_per_child') $loglevel = lookup('swh::deploy::worker::storage_archiver::loglevel') - $config_file = lookup('swh::deploy::worker::storage_archiver::conf_file') + $config_file = lookup('swh::deploy::worker::storage_archiver::config_file') $config = lookup('swh::deploy::worker::storage_archiver::config') ::profile::swh::deploy::worker::instance {'storage_archiver': ensure => present, concurrency => $concurrency, loglevel => $loglevel, max_tasks_per_child => $max_tasks_per_child, require => [ File[$config_file], ], } file {$config_file: ensure => 'present', owner => 'swhworker', group => 'swhdev', # Contains passwords mode => '0640', content => inline_template("<%= @config.to_yaml %>\n"), } }