diff --git a/manifests/swh/deploy/worker/instance.pp b/manifests/swh/deploy/worker/instance.pp --- a/manifests/swh/deploy/worker/instance.pp +++ b/manifests/swh/deploy/worker/instance.pp @@ -9,7 +9,8 @@ $loglevel = 'info', $max_tasks_per_child = 5, $instance_name = $title, - $limit_no_file = 'None') + $limit_no_file = undef, + $private_tmp = undef) { include ::profile::swh::deploy::worker::base include ::systemd diff --git a/manifests/swh/deploy/worker/swh_loader_mercurial.pp b/manifests/swh/deploy/worker/swh_loader_mercurial.pp --- a/manifests/swh/deploy/worker/swh_loader_mercurial.pp +++ b/manifests/swh/deploy/worker/swh_loader_mercurial.pp @@ -13,7 +13,7 @@ $task_queues = ['swh_loader_mercurial', 'swh_loader_mercurial_archive'] $service_name = 'swh_loader_mercurial' - + $private_tmp = hiera('swh::deploy::worker::swh_loader_mercurial::private_tmp') $packages = ['python3-swh.loader.mercurial'] @@ -29,6 +29,7 @@ task_broker => $task_broker, task_modules => $task_modules, task_queues => $task_queues, + private_tmp => $private_tmp, require => [ File[$config_file], ], diff --git a/manifests/swh/deploy/worker/swh_loader_svn.pp b/manifests/swh/deploy/worker/swh_loader_svn.pp --- a/manifests/swh/deploy/worker/swh_loader_svn.pp +++ b/manifests/swh/deploy/worker/swh_loader_svn.pp @@ -12,6 +12,7 @@ $packages = ['python3-swh.loader.svn'] $limit_no_file = hiera('swh::deploy::worker::swh_loader_svn::limit_no_file') + $private_tmp = hiera('swh::deploy::worker::swh_loader_svn::private_tmp') package {$packages: ensure => 'latest', @@ -25,6 +26,7 @@ task_modules => $task_modules, task_queues => $task_queues, limit_no_file => $limit_no_file, + private_tmp => $private_tmp, require => [ Package[$packages], File[$config_file], diff --git a/templates/swh/deploy/worker/parameters.conf.erb b/templates/swh/deploy/worker/parameters.conf.erb --- a/templates/swh/deploy/worker/parameters.conf.erb +++ b/templates/swh/deploy/worker/parameters.conf.erb @@ -5,6 +5,9 @@ Environment=CONCURRENCY=<%= @concurrency %> Environment=MAX_TASKS_PER_CHILD=<%= @max_tasks_per_child %> Environment=LOGLEVEL=<%= @loglevel %> -<% if @limit_no_file != 'None' %> +<% if @limit_no_file %> LimitNOFILE=<%= @limit_no_file %> <% end %> +<% if @private_tmp %> +TmpPrivate=<%= @private_tmp %> +<% end %>